From 6be9d197386b5c3bd72023981df805d42f87684c Mon Sep 17 00:00:00 2001 From: Joris Offouga Date: Thu, 11 Jul 2019 07:43:07 +0200 Subject: wic: Fix image generation for i.MX with SPL and U-Boot Some boards expects a specific binary name. Example : Pico i.MX7D required the u-boot-dtb.img file (instead of u-boot.img). Signed-off-by: Joris Offouga --- wic/imx-uboot-spl-bootpart.wks | 20 -------------------- wic/imx-uboot-spl-bootpart.wks.in | 20 ++++++++++++++++++++ wic/imx-uboot-spl.wks | 19 ------------------- wic/imx-uboot-spl.wks.in | 19 +++++++++++++++++++ 4 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 wic/imx-uboot-spl-bootpart.wks create mode 100644 wic/imx-uboot-spl-bootpart.wks.in delete mode 100644 wic/imx-uboot-spl.wks create mode 100644 wic/imx-uboot-spl.wks.in (limited to 'wic') diff --git a/wic/imx-uboot-spl-bootpart.wks b/wic/imx-uboot-spl-bootpart.wks deleted file mode 100644 index 4e16ec35..00000000 --- a/wic/imx-uboot-spl-bootpart.wks +++ /dev/null @@ -1,20 +0,0 @@ -# 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 SPL and u-boot -# -# The disk layout used is: -# - ----- --------- -------------- -------------- -# | | SPL | u-boot | boot | rootfs | -# - ----- --------- -------------- -------------- -# ^ ^ ^ ^ ^ -# | | | | | -# 0 1kiB 69kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) -# -part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 -part u-boot --source rawcopy --sourceparams="file=u-boot.img" --ondisk mmcblk --no-table --align 69 -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 - -bootloader --ptable msdos diff --git a/wic/imx-uboot-spl-bootpart.wks.in b/wic/imx-uboot-spl-bootpart.wks.in new file mode 100644 index 00000000..8062c51e --- /dev/null +++ b/wic/imx-uboot-spl-bootpart.wks.in @@ -0,0 +1,20 @@ +# 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 SPL and u-boot +# +# The disk layout used is: +# - ----- --------- -------------- -------------- +# | | SPL | u-boot | boot | rootfs | +# - ----- --------- -------------- -------------- +# ^ ^ ^ ^ ^ +# | | | | | +# 0 1kiB 69kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) +# +part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 +part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 69 +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 + +bootloader --ptable msdos diff --git a/wic/imx-uboot-spl.wks b/wic/imx-uboot-spl.wks deleted file mode 100644 index e7b3beed..00000000 --- a/wic/imx-uboot-spl.wks +++ /dev/null @@ -1,19 +0,0 @@ -# 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 SPL and u-boot -# -# The disk layout used is: -# - ----- --------- -------------- -# | | SPL | u-boot | rootfs | -# - ----- --------- -------------- -# ^ ^ ^ ^ ^ -# | | | | | -# 0 1kiB 69kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) -# -part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 -part u-boot --source rawcopy --sourceparams="file=u-boot.img" --ondisk mmcblk --no-table --align 69 -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 - -bootloader --ptable msdos diff --git a/wic/imx-uboot-spl.wks.in b/wic/imx-uboot-spl.wks.in new file mode 100644 index 00000000..db2f89dd --- /dev/null +++ b/wic/imx-uboot-spl.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 SPL and u-boot +# +# The disk layout used is: +# - ----- --------- -------------- +# | | SPL | u-boot | rootfs | +# - ----- --------- -------------- +# ^ ^ ^ ^ ^ +# | | | | | +# 0 1kiB 69kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) +# +part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 +part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 69 +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 + +bootloader --ptable msdos -- cgit v1.2.3-54-g00ecf