From 079e293684fea95f5026d2bd7df719879e4dea98 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 17 Sep 2021 14:40:44 +0200 Subject: 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 --- classes/imx-boot-container.bbclass | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'classes') 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() { 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 -- cgit v1.2.3-54-g00ecf