diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2022-01-18 12:52:20 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2022-01-18 12:59:16 +0000 |
| commit | 399f542a2d26237770eb5013c698990b7417a403 (patch) | |
| tree | 16a1950a913b848c5a7ec56ccc12eb2dac7b5cea /wic | |
| parent | a5cf92c3c35ce1fea695c36320fe72cdf102693f (diff) | |
| download | meta-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 'wic')
| -rw-r--r-- | wic/imx-boot-container-bootpart.wks.in | 13 |
1 files changed, 6 insertions, 7 deletions
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 @@ | |||
| 11 | # U-Boot DTB file, ATF, and optional OP-TEE components. | 11 | # U-Boot DTB file, ATF, and optional OP-TEE components. |
| 12 | # | 12 | # |
| 13 | # The disk layout used is: | 13 | # The disk layout used is: |
| 14 | # - ----------- -------------- ---------------------------- | 14 | # - ----------- -------------- ------------- |
| 15 | # | | flash.bin | u-boot.itb | boot | rootfs | | 15 | # | | flash.bin | boot | rootfs | |
| 16 | # - ----------- -------------- ---------------------------- | 16 | # - ----------- -------------- ------------- |
| 17 | # ^ ^ ^ ^ ^ ^ | 17 | # ^ ^ ^ ^ ^ |
| 18 | # | | | | | | | 18 | # | | | | | |
| 19 | # 0 | 384KiB 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 19 | # 0 | 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
| 20 | # ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual | 20 | # ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual |
| 21 | # | 21 | # |
| 22 | part u-boot --source rawcopy --sourceparams="file=flash.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK} | 22 | part u-boot --source rawcopy --sourceparams="file=flash.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK} |
| 23 | part u-boot-itb --source rawcopy --sourceparams="file=u-boot.itb" --ondisk mmcblk --no-table --align 384 | ||
| 24 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64 | 23 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64 |
| 25 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192 | 24 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192 |
| 26 | 25 | ||