aboutsummaryrefslogtreecommitdiffstats
path: root/wic
diff options
context:
space:
mode:
Diffstat (limited to 'wic')
-rw-r--r--wic/imx-boot-container-bootpart.wks.in27
-rw-r--r--wic/imx-imx-boot.wks.in19
-rw-r--r--wic/imx-uboot-mxs-bootpart.wks.in2
3 files changed, 20 insertions, 28 deletions
diff --git a/wic/imx-boot-container-bootpart.wks.in b/wic/imx-boot-container-bootpart.wks.in
deleted file mode 100644
index 88679a68..00000000
--- a/wic/imx-boot-container-bootpart.wks.in
+++ /dev/null
@@ -1,27 +0,0 @@
-# short-description: Create SD card image with a boot partition for i.MX8M
-# long-description:
-# Create an image that can be written onto a SD card using dd for use
-# with i.MX8M SoC family
-# It uses binary boot container called flash.bin provided directly by
-# the U-Boot recipe, and U-Boot ITB files which is created by binman utility
-# of U-Boot.
-# Those files are added it into the boot partition, which is populated as a
-# raw copy into the image.
-# Boot container prepared by U-Boot already container SPL, U-Boot itself,
-# 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)
-# ${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
-
-bootloader --ptable msdos
diff --git a/wic/imx-imx-boot.wks.in b/wic/imx-imx-boot.wks.in
new file mode 100644
index 00000000..8e78b5e3
--- /dev/null
+++ b/wic/imx-imx-boot.wks.in
@@ -0,0 +1,19 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family
+# It uses u-boot + other binaries gathered together on imx-boot file
+#
+# The disk layout used is:
+# - ---------- --------------
+# | | imx-boot | rootfs |
+# - ---------- --------------
+# ^ ^ ^ ^
+# | | | |
+# 0 | 8MiB 8MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+# ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
+#
+part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192
+
+bootloader --ptable msdos
diff --git a/wic/imx-uboot-mxs-bootpart.wks.in b/wic/imx-uboot-mxs-bootpart.wks.in
index 01eb88cc..175499d6 100644
--- a/wic/imx-uboot-mxs-bootpart.wks.in
+++ b/wic/imx-uboot-mxs-bootpart.wks.in
@@ -12,7 +12,7 @@
# | | | |
# 0 1kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
#
-part u-boot --source rawcopy --sourceparams="file=${IMAGE_LINK_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --align 1024
+part u-boot --source rawcopy --sourceparams="file=${IMAGE_LINK_NAME}.uboot-mxsboot-sdcard" --ondisk mmcblk --align 1024
part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096