[PATCH v2 1/5] imx-alsa-plugins: Add support for all mx6 and mx7 machines

[PATCH v2 1/5] imx-alsa-plugins: Add support for all mx6 and mx7 machines

[Fabio Berton]

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb
index 574a260..6f453af 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb
@@ -33,7 +33,5 @@ FILES_${PN} += "${libdir}/alsa-lib/libasound_*.so"
 FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug"
 FILES_${PN}-dev += "${libdir}/alsa-lib/*.la"
 
-COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"
-PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
-PACKAGE_ARCH_mx6ul = "${MACHINE_SOCARCH}"
-PACKAGE_ARCH_mx7 = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d)"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-- 
2.1.4

[PATCH v2 2/5] imx-base: Set extra audio support for all mx6 and mx7 machines

[Fabio Berton]

Install imx-alsa-plugins as MACHINE_EXTRA_RRECOMMENDS for all mx6 and
mx7 machines on distros that have alsa feature.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/include/imx-base.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 6eab64d..5606250 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -108,7 +108,13 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
 
 # Extra audio support
 # FIXME: Add support for ALL SoC families
-MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6dl = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6q = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6sl = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6sx = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6ul = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6ull = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx7d = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
 
 # Extra udev rules
 MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
-- 
2.1.4

[PATCH v2 3/5] imx-gst1.0-plugin: Add support for all mx6 and mx7 machines

[Fabio Berton]

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bb
index 5b22f46..c34c65b 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bb
@@ -12,7 +12,7 @@ DEPENDS_append_mx6dl = " imx-lib imx-vpu imx-vpuwrap"
 DEPENDS_append_mx6sl = " imx-lib"
 DEPENDS_append_mx6sx = " imx-lib"
 DEPENDS_append_mx6ul = " imx-lib"
-DEPENDS_append_mx7 = " imx-lib"
+DEPENDS_append_mx7d = " imx-lib"
 
 # For backwards compatibility
 RREPLACES_${PN} = "gst1.0-fsl-plugin"
@@ -37,11 +37,13 @@ inherit autotools pkgconfig
 # Make sure kernel sources are available
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
-PLATFORM_mx6 = "MX6"
+PLATFORM_mx6dl = "MX6DL"
+PLATFORM_mx6q = "MX6Q"
 PLATFORM_mx6sl = "MX6SL"
 PLATFORM_mx6sx = "MX6SX"
 PLATFORM_mx6ul = "MX6UL"
-PLATFORM_mx7= "MX7D"
+PLATFORM_mx6ull = "MX6ULL"
+PLATFORM_mx7d = "MX7D"
 
 # Todo add a mechanism to map possible build targets
 EXTRA_OECONF = "PLATFORM=${PLATFORM} \
@@ -56,7 +58,10 @@ BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis"
 RDEPENDS_${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux "
 
 PACKAGECONFIG ?= ""
-PACKAGECONFIG_mx6 = "overlaysink"
+PACKAGECONFIG_mx6dl = "overlaysink"
+PACKAGECONFIG_mx6q = "overlaysink"
+PACKAGECONFIG_mx6sl = "overlaysink"
+PACKAGECONFIG_mx6sx = "overlaysink"
 
 
 # FIXME: Add all features
@@ -82,4 +87,4 @@ FILES_${PN}-grecorder = "${bindir}/grecorder-1.0"
 FILES_${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}"
 FILES_${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}"
 
-COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"
+COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d)"
-- 
2.1.4

[PATCH v2 4/5] gstreamer1.0-plugins-imx: Add support for all mx6 and mx7 machines

[Fabio Berton]

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb
index 8a1777f..07273d6 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb
@@ -63,4 +63,4 @@ require recipes-multimedia/gstreamer/gst-plugins-package.inc
 # the following line is required to produce one package for each plugin
 PACKAGES_DYNAMIC = "^${PN}-.*"
 
-COMPATIBLE_MACHINE = "(mx6|mx7)"
+COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d)"
-- 
2.1.4

[PATCH v2 5/5] imx-base: Use GStreamer 1.0 plugins for all mx6 and mx7 machines

[Fabio Berton]

Set MACHINE_GSTREAMER_1_0_PLUGIN variable to use gstreamer1.0-plugins-imx-meta
for all mx6 and mx7 machines.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 conf/machine/include/imx-base.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 5606250..29677f2 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -121,9 +121,13 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
 
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gstreamer1.0-plugins-imx-meta"
 MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx7 ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx6sl ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx6sx ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx6ul ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx6ull ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx7d ?= "gstreamer1.0-plugins-imx-meta"
 
 # Determines if the SoC has support for Vivante kernel driver
 SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT       = "0"
-- 
2.1.4