renesas: build sdcard image

Use sdcard image class from meta-fsl-arm

Task-number: QTAUTO-169
Change-Id: Ie50f49bb377ff5e0887f96a098c7d939c45b10b2
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>

5 files changed, 7 insertions, 4 deletions

diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index 0ce12e4..19cd5d7 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -21,7 +21,7 @@
 
 IMAGE_ROOTFS_EXTRA_SPACE = "100000"
 SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-SDCARD_GENERATION_COMMAND_ti33x = "generate_imx_sdcard"
+SDCARD_GENERATION_COMMAND ?= "generate_imx_sdcard"
 
 IMAGE_CMD_sdcard_append() {
     parted -s ${SDCARD} set 1 boot on
diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample
index 9a35b26..543ca9b 100644
--- a/conf/bblayers.conf.rcar-gen2.sample
+++ b/conf/bblayers.conf.rcar-gen2.sample
@@ -32,6 +32,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/poky/meta \
   ${BSPDIR}/sources/poky/meta-yocto \
   ${BSPDIR}/sources/meta-b2qt/meta-renesas-extras \
+  ${BSPDIR}/sources/meta-fsl-arm \
   ${BSPDIR}/sources/meta-renesas \
   ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index 2baa452..c7c8944 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -56,7 +56,8 @@ GLES_DRIVER_r8a7790 = "rgx"
 DISTRO_FEATURES += "wayland bluetooth bluez5 h264avcenc_lib"
 MACHINE_FEATURES += "multimedia ${GLES_DRIVER}"
 
-IMAGE_FSTYPES += "ext3"
+IMAGE_FSTYPES += "ext3 sdcard"
+IMAGE_CLASSES += "image_types_fsl"
 
 PREFERRED_VERSION_gstreamer1.0-libav = "1.2.3"
 
@@ -121,4 +122,5 @@ ${BB_MULTIMEDIA_TEST_MODULE}\
 |dtv-module|ssp-module|scu-module\
 |gles-test-module\
 |poky/meta/recipes-graphics/mesa\
+|meta-fsl-arm/recipes-graphics/mesa\
 "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 1af0ca7..26a1816 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -36,7 +36,7 @@
            remote="yocto"
            revision="8d22b44716fa624ff87383c36d222d9e28d0b267"
            path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
+           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
   <project name="meta-ti"
            remote="yocto"
            revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index bf67a8d..390486a 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -36,7 +36,7 @@
            remote="yocto"
            revision="jethro"
            path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
+           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
   <project name="meta-ti"
            remote="yocto"
            revision="master"