summaryrefslogtreecommitdiffstats
path: root/classes/imx-boot-container.bbclass
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2021-09-17 14:40:44 +0200
committerRasmus Villemoes <rasmus.villemoes@prevas.dk>2021-09-20 11:27:27 +0200
commit079e293684fea95f5026d2bd7df719879e4dea98 (patch)
tree0c8e816beda1c8eb75dcf3df57e822cdb9b15ae2 /classes/imx-boot-container.bbclass
parent72f59d35816cd2be6159013e4d96d03abf7f1c4b (diff)
downloadmeta-freescale-079e293684fea95f5026d2bd7df719879e4dea98.tar.gz
imx-boot-container.bbclass: support having more than one UBOOT_CONFIG
The whole purpose of the UBOOT_CONFIG machinery is to allow one to build multiple versions of U-Boot within the same recipe, e.g. one for writing to an eMMC boot partition, and one for use with an SD card for bootstrapping/recovery. But the current code here assumes UBOOT_CONFIG consists of just a single word (and normally leading whitespace in that variable would be harmless). So use the variable ${type} which gets set in turn to each individual word in UBOOT_CONFIG, which was probably the original intention anyway. Add a comment about what the u-boot.itb and flash.bin symlinks will end up pointing at. When UBOOT_CONFIG does indeed consist of a single word only, this changes nothing. But this unbreaks the build and makes the different artifacts available for the UBOOT_CONFIG = "sd emmc ..." case that may be used by custom boards. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Diffstat (limited to 'classes/imx-boot-container.bbclass')
-rw-r--r--classes/imx-boot-container.bbclass15
1 files changed, 11 insertions, 4 deletions
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 41fe9cca..3f788900 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -85,10 +85,17 @@ do_deploy_append() {
85 j=$(expr $j + 1); 85 j=$(expr $j + 1);
86 if [ $j -eq $i ] 86 if [ $j -eq $i ]
87 then 87 then
88 install -m 0644 ${B}/${config}/u-boot.itb ${DEPLOYDIR}/u-boot.itb-${MACHINE}-${UBOOT_CONFIG} 88 install -m 0644 ${B}/${config}/u-boot.itb ${DEPLOYDIR}/u-boot.itb-${MACHINE}-${type}
89 install -m 0644 ${B}/${config}/flash.bin ${DEPLOYDIR}/flash.bin-${MACHINE}-${UBOOT_CONFIG} 89 install -m 0644 ${B}/${config}/flash.bin ${DEPLOYDIR}/flash.bin-${MACHINE}-${type}
90 ln -sf u-boot.itb-${MACHINE}-${UBOOT_CONFIG} u-boot.itb 90 # When there's more than one word in UBOOT_CONFIG,
91 ln -sf flash.bin-${MACHINE}-${UBOOT_CONFIG} flash.bin 91 # this will overwrite the links created in
92 # previous loop iterations, effectively making
93 # u-boot.itb and flash.bin correspond to the _last_
94 # word in UBOOT_CONFIG. This is also how all other
95 # artifacts handled by oe-core's u-boot.inc are
96 # treated.
97 ln -sf u-boot.itb-${MACHINE}-${type} u-boot.itb
98 ln -sf flash.bin-${MACHINE}-${type} flash.bin
92 fi 99 fi
93 done 100 done
94 unset j 101 unset j