From 6be9d197386b5c3bd72023981df805d42f87684c Mon Sep 17 00:00:00 2001 From: Joris Offouga Date: Thu, 11 Jul 2019 07:43:07 +0200 Subject: [PATCH] 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 --- ...imx-uboot-spl-bootpart.wks => imx-uboot-spl-bootpart.wks.in} | 2 +- wic/{imx-uboot-spl.wks => imx-uboot-spl.wks.in} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename wic/{imx-uboot-spl-bootpart.wks => imx-uboot-spl-bootpart.wks.in} (89%) rename wic/{imx-uboot-spl.wks => imx-uboot-spl.wks.in} (86%) diff --git a/wic/imx-uboot-spl-bootpart.wks b/wic/imx-uboot-spl-bootpart.wks.in similarity index 89% rename from wic/imx-uboot-spl-bootpart.wks rename to wic/imx-uboot-spl-bootpart.wks.in index 4e16ec35..8062c51e 100644 --- a/wic/imx-uboot-spl-bootpart.wks +++ b/wic/imx-uboot-spl-bootpart.wks.in @@ -13,7 +13,7 @@ # 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 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 diff --git a/wic/imx-uboot-spl.wks b/wic/imx-uboot-spl.wks.in similarity index 86% rename from wic/imx-uboot-spl.wks rename to wic/imx-uboot-spl.wks.in index e7b3beed..db2f89dd 100644 --- a/wic/imx-uboot-spl.wks +++ b/wic/imx-uboot-spl.wks.in @@ -13,7 +13,7 @@ # 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 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 -- 2.40.1