[meta-freescale] [PATCH 2/2] wic: Fix image generation for i.MX MXS SoC family

[Otavio Salvador]

The image needs to use the U-Boot, bootstream, generated for the uSD
card and a dependency on that must be added so we get it deployed
before using the file. 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 at ossystems.com.br>
---

 classes/image_types_fsl.bbclass                              | 5 +++++
 conf/machine/include/imx-base.inc                            | 2 +-
 ...-uboot-mxs-bootpart.wks => imx-uboot-mxs-bootpart.wks.in} | 2 +-
 wic/{imx-uboot-mxs.wks => imx-uboot-mxs.wks.in}              | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename wic/{imx-uboot-mxs-bootpart.wks => imx-uboot-mxs-bootpart.wks.in} (83%)
 rename wic/{imx-uboot-mxs.wks => imx-uboot-mxs.wks.in} (79%)

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 4709af95..65b2a9a8 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -312,3 +312,8 @@ IMAGE_TYPEDEP_sdcard_append = " \
     ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', 'uboot-mxsboot-sdcard', '', d)} \
     ${@bb.utils.contains('IMAGE_FSTYPES', 'barebox-mxsboot-sdcard', 'barebox-mxsboot-sdcard', '', d)} \
 "
+
+do_image_wic[depends] += " \
+    ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', \
+                                          '${IMAGE_BASENAME}:do_image_uboot_mxsboot_sdcard', '', d)} \
+"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index ab9fcf30..50de9a70 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -257,7 +257,7 @@ WKS_FILE_DEPENDS ?= " \
 "
 
 SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks"
-SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks"
+SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
 
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
 
diff --git a/wic/imx-uboot-mxs-bootpart.wks b/wic/imx-uboot-mxs-bootpart.wks.in
similarity index 83%
rename from wic/imx-uboot-mxs-bootpart.wks
rename to wic/imx-uboot-mxs-bootpart.wks.in
index 0e96ab3a..29fe1a50 100644
--- a/wic/imx-uboot-mxs-bootpart.wks
+++ 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=u-boot.sb" --ondisk mmcblk --no-table --align 1
+part u-boot --source rawcopy --sourceparams="file=${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --fstype=ontrackdm6aux3 --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
 
diff --git a/wic/imx-uboot-mxs.wks b/wic/imx-uboot-mxs.wks.in
similarity index 79%
rename from wic/imx-uboot-mxs.wks
rename to wic/imx-uboot-mxs.wks.in
index 0f5c51d4..ae30c903 100644
--- a/wic/imx-uboot-mxs.wks
+++ b/wic/imx-uboot-mxs.wks.in
@@ -12,7 +12,7 @@
 # | |         |              |
 # 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 u-boot --source rawcopy --sourceparams="file=${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard" --ondisk mmcblk --fstype=ontrackdm6aux3 --align 1
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
 
 bootloader --ptable msdos
-- 
2.17.0