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>

diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 3ffa7cbd925eed53a17d082e23a8c39648d9b57d..19b433128be7c9010951d7dd2bd5a0bc9a83687c 100644 (file)
--- 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 88679a68f207f8bb8f3b944525faf320f030c484..321ee46b9a2a53ed48aa393343016de22511567f 100644 (file)
--- 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