summaryrefslogtreecommitdiffstats
path: root/classes/imx-boot-container.bbclass
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.z@gmail.com>2022-01-18 12:52:20 +0000
committerAndrey Zhizhikin <andrey.z@gmail.com>2022-01-18 12:59:16 +0000
commit399f542a2d26237770eb5013c698990b7417a403 (patch)
tree16a1950a913b848c5a7ec56ccc12eb2dac7b5cea /classes/imx-boot-container.bbclass
parenta5cf92c3c35ce1fea695c36320fe72cdf102693f (diff)
downloadmeta-freescale-399f542a2d26237770eb5013c698990b7417a403.tar.gz
imx-boot-container: align with u-boot 2022.01
Recent version of U-Boot v2022.01 reverted boot container generation mechanism to provide single boot container isntead of separate binaries for SPL+DDR and U-Boot FIT. New approach provides packing of those separate components inside the U-Boot binman, and is delivered as a single 'flash.bin' file, which resembles the original behavior before binman image packing was introduced. Adapt our boot container class and WIC file to pick up this consolidated binary instead of two separate pieces. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'classes/imx-boot-container.bbclass')
-rw-r--r--classes/imx-boot-container.bbclass2
1 files changed, 0 insertions, 2 deletions
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 3ffa7cbd..19b43312 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -85,7 +85,6 @@ 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}-${type}
89 install -m 0644 ${B}/${config}/flash.bin ${DEPLOYDIR}/flash.bin-${MACHINE}-${type} 88 install -m 0644 ${B}/${config}/flash.bin ${DEPLOYDIR}/flash.bin-${MACHINE}-${type}
90 # When there's more than one word in UBOOT_CONFIG, 89 # When there's more than one word in UBOOT_CONFIG,
91 # this will overwrite the links created in 90 # this will overwrite the links created in
@@ -94,7 +93,6 @@ do_deploy:append() {
94 # word in UBOOT_CONFIG. This is also how all other 93 # word in UBOOT_CONFIG. This is also how all other
95 # artifacts handled by oe-core's u-boot.inc are 94 # artifacts handled by oe-core's u-boot.inc are
96 # treated. 95 # treated.
97 ln -sf u-boot.itb-${MACHINE}-${type} u-boot.itb
98 ln -sf flash.bin-${MACHINE}-${type} flash.bin 96 ln -sf flash.bin-${MACHINE}-${type} flash.bin
99 fi 97 fi
100 done 98 done