diff options
-rw-r--r-- | classes/imx-boot-container.bbclass | 2 | ||||
-rw-r--r-- | wic/imx-boot-container-bootpart.wks.in | 13 |
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() { | |||
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 |
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 | ||