From 399f542a2d26237770eb5013c698990b7417a403 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 18 Jan 2022 12:52:20 +0000 Subject: 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 --- classes/imx-boot-container.bbclass | 2 -- 1 file changed, 2 deletions(-) (limited to 'classes/imx-boot-container.bbclass') diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass index 3ffa7cbd9..19b433128 100644 --- a/classes/imx-boot-container.bbclass +++ b/classes/imx-boot-container.bbclass @@ -85,7 +85,6 @@ 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}-${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 @@ -94,7 +93,6 @@ do_deploy:append() { # 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 -- cgit v1.2.3-54-g00ecf