From ecdd93874f434fc200c811392cc83f255f26a4c9 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 26 Apr 2018 13:52:55 -0300
Subject: wic: Fix image generation for i.MX MXS SoC family

The image needs to use the U-Boot generated, for the uSD card, so a
dependency on that must be added to ensure the file is available prior
'wic' uses it.

Besides that, the fstype needs to be changed so it sets the partition
mark allowing the bootrom to find it.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 wic/imx-uboot-mxs-bootpart.wks    | 19 -------------------
 wic/imx-uboot-mxs-bootpart.wks.in | 19 +++++++++++++++++++
 wic/imx-uboot-mxs.wks             | 18 ------------------
 wic/imx-uboot-mxs.wks.in          | 18 ++++++++++++++++++
 4 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 wic/imx-uboot-mxs-bootpart.wks
 create mode 100644 wic/imx-uboot-mxs-bootpart.wks.in
 delete mode 100644 wic/imx-uboot-mxs.wks
 create mode 100644 wic/imx-uboot-mxs.wks.in

(limited to 'wic')

diff --git a/wic/imx-uboot-mxs-bootpart.wks b/wic/imx-uboot-mxs-bootpart.wks
deleted file mode 100644
index 0e96ab3aa..000000000
--- a/wic/imx-uboot-mxs-bootpart.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 u-boot
-#
-# The disk layout used is:
-#  - --------- -------------- --------------
-# | | u-boot  |     boot     |    rootfs   |
-#  - --------- -------------- --------------
-# ^ ^         ^              ^
-# | |         |              |
-# 0 1kiB    4MiB          16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
-#
-part u-boot --source rawcopy --sourceparams="file=u-boot.sb" --ondisk mmcblk --no-table --align 1
-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-mxs-bootpart.wks.in b/wic/imx-uboot-mxs-bootpart.wks.in
new file mode 100644
index 000000000..8b5bdd487
--- /dev/null
+++ b/wic/imx-uboot-mxs-bootpart.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
+#
+# The disk layout used is:
+#  - --------- -------------- --------------
+# | | u-boot  |     boot     |    rootfs   |
+#  - --------- -------------- --------------
+# ^ ^         ^              ^
+# | |         |              |
+# 0 1kiB    4MiB          16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#
+part u-boot --source rawcopy --sourceparams="file=${IMAGE_NAME}.rootfs.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
+
+bootloader --ptable msdos
diff --git a/wic/imx-uboot-mxs.wks b/wic/imx-uboot-mxs.wks
deleted file mode 100644
index 0f5c51d47..000000000
--- a/wic/imx-uboot-mxs.wks
+++ /dev/null
@@ -1,18 +0,0 @@
-# short-description: Create SD card image without 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
-#
-# The disk layout used is:
-#  - --------- --------------
-# | | u-boot  |    rootfs    |
-#  - --------- --------------
-# ^ ^         ^              ^
-# | |         |              |
-# 0 1kiB    4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
-#
-part u-boot --source rawcopy --sourceparams="file=u-boot.sb" --ondisk mmcblk --no-table --align 1
-part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
-
-bootloader --ptable msdos
diff --git a/wic/imx-uboot-mxs.wks.in b/wic/imx-uboot-mxs.wks.in
new file mode 100644
index 000000000..44b6f9319
--- /dev/null
+++ b/wic/imx-uboot-mxs.wks.in
@@ -0,0 +1,18 @@
+# short-description: Create SD card image without 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
+#
+# The disk layout used is:
+#  - --------- --------------
+# | | u-boot  |    rootfs    |
+#  - --------- --------------
+# ^ ^         ^              ^
+# | |         |              |
+# 0 1kiB    4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#
+part u-boot --source rawcopy --sourceparams="file=${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --align 1024
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
+
+bootloader --ptable msdos
-- 
cgit v1.2.3-54-g00ecf