Merge pull request #870 from Villemoes/imx-boot-config

imx-boot-container.bbclass: support having more than one UBOOT_CONFIG

1 files changed, 11 insertions, 4 deletions

diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 33de45c5..3ffa7cbd 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -85,10 +85,17 @@ do_deploy:append() {
                 j=$(expr $j + 1);
                 if [ $j -eq $i ]
                 then
-                    install -m 0644 ${B}/${config}/u-boot.itb  ${DEPLOYDIR}/u-boot.itb-${MACHINE}-${UBOOT_CONFIG}
-                    install -m 0644 ${B}/${config}/flash.bin  ${DEPLOYDIR}/flash.bin-${MACHINE}-${UBOOT_CONFIG}
-                    ln -sf u-boot.itb-${MACHINE}-${UBOOT_CONFIG} u-boot.itb
-                    ln -sf flash.bin-${MACHINE}-${UBOOT_CONFIG} flash.bin
+                    install -m 0644 ${B}/${config}/u-boot.itb  ${DEPLOYDIR}/u-boot.itb-${MACHINE}-${type}
+                    install -m 0644 ${B}/${config}/flash.bin  ${DEPLOYDIR}/flash.bin-${MACHINE}-${type}
+                    # When there's more than one word in UBOOT_CONFIG,
+                    # this will overwrite the links created in
+                    # previous loop iterations, effectively making
+                    # u-boot.itb and flash.bin correspond to the _last_
+                    # word in UBOOT_CONFIG. This is also how all other
+                    # artifacts handled by oe-core's u-boot.inc are
+                    # treated.
+                    ln -sf u-boot.itb-${MACHINE}-${type} u-boot.itb
+                    ln -sf flash.bin-${MACHINE}-${type} flash.bin
                 fi
             done
             unset  j