u-boot.inc: Add UBOOT_BINARY sym links for UBOOT_CONFIG types

An additional use case of UBOOT_CONFIG is when a machine has applicability
to boards of the same architecture but different in other ways
to require a different UBOOT_BINARY build.

The UBOOT_CONFIG default value can be a list of these board types.

For example:
    UBOOT_CONFIG ??= "boardA boardB"
    UBOOT_CONFIG[boardA] = "boardA_defconfig"
    UBOOT_CONFIG[boardB] = "boardB_defconfig"

Change do_install and do_deploy sections which process a UBOOT_CONFIG list
to create short symbolic links to each of the config types for UBOOT_BINARY.
This is similar to the links currently being created for
SPL_BINARY when it is defined with a UBOOT_CONFIG list.

For the above example, and UBOOT_BINARY as u-boot.bin,
the additional symbolic links created in the DEPLOYDIR would be

    u-boot.bin-boardA
    u-boot.bin-boardB

Signed-off-by: Lee Nipper <lee.nipper@linux.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index c76f87f5a2744eb06fe565022e3499918cf5c658..990ddb168eea14c61b7601748d69e46bc8a40b24 100644 (file)
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -97,6 +97,7 @@ do_install () {
                 then
                     install -d ${D}/boot
                     install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
+                    ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type}
                     ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}
                 fi
             done
@@ -159,7 +160,9 @@ do_deploy () {
                     install -d ${DEPLOYDIR}
                     install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
                     cd ${DEPLOYDIR}
+                    ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type}
                     ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}
+                    ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type}
                     ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}
                 fi 
             done