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>
(cherry picked from commit ecdd93874f434fc200c811392cc83f255f26a4c9)

1 files changed, 14 insertions, 0 deletions

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 4709af952..e7627200b 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -312,3 +312,17 @@ 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)} \
 "
+
+# In case we are building for i.MX23 or i.MX28 we need to have the
+# image stream built before the wic generation
+do_image_wic[depends] += " \
+    ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', \
+                                          '${IMAGE_BASENAME}:do_image_uboot_mxsboot_sdcard', '', d)} \
+"
+
+# We need to apply a fixup inside of the partition table
+IMAGE_CMD_wic_append_mxs() {
+        # Change partition type for mxs processor family
+        bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
+        echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc
+}