aboutsummaryrefslogtreecommitdiffstats
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
parenta5cf92c3c35ce1fea695c36320fe72cdf102693f (diff)
downloadmeta-freescale-399f542a2d26237770eb5013c698990b7417a403.tar.gz
meta-freescale-399f542a2d26237770eb5013c698990b7417a403.tar.bz2
meta-freescale-399f542a2d26237770eb5013c698990b7417a403.zip
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>
-rw-r--r--classes/imx-boot-container.bbclass2
-rw-r--r--wic/imx-boot-container-bootpart.wks.in13
2 files changed, 6 insertions, 9 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() {
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
diff --git a/wic/imx-boot-container-bootpart.wks.in b/wic/imx-boot-container-bootpart.wks.in
index 88679a68..321ee46b 100644
--- a/wic/imx-boot-container-bootpart.wks.in
+++ b/wic/imx-boot-container-bootpart.wks.in
@@ -11,16 +11,15 @@
# U-Boot DTB file, ATF, and optional OP-TEE components.
#
# The disk layout used is:
-# - ----------- -------------- ----------------------------
-# | | flash.bin | u-boot.itb | boot | rootfs |
-# - ----------- -------------- ----------------------------
-# ^ ^ ^ ^ ^ ^
-# | | | | | |
-# 0 | 384KiB 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+# - ----------- -------------- -------------
+# | | flash.bin | boot | rootfs |
+# - ----------- -------------- -------------
+# ^ ^ ^ ^ ^
+# | | | | |
+# 0 | 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
# ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
#
part u-boot --source rawcopy --sourceparams="file=flash.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
-part u-boot-itb --source rawcopy --sourceparams="file=u-boot.itb" --ondisk mmcblk --no-table --align 384
part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192