[meta-fsl-arm PATCH v2 00/31] Dynamically package architecture and uboot-config

[meta-fsl-arm PATCH v2 00/31] Dynamically package architecture and uboot-config

[Otavio Salvador]

This patchset makes the PACKAGE_ARCH setting much more robust as it is
auto-detected for most common and hard to guess cases. The biggest
benefit of this is the reducing of amount of package builds as many
are now shared by the MACHINE_SOCARCH package architecture.

Here also goes the v2 of Mario's patches with the fix asked by Lauren.

Changes for v2:
- rework commit logs for clearness
- rework documentation of classes
- fix imx6dlsabresd as Lauren request
- change SUBARCH_FILTER for MACHINE_SOCARCH_FILTER
- change MACHINE_SUBARCH for MACHINE_SOCARCH

Mario Domenech Goulart (7):
  imx6dlsabreauto: set up UBOOT_CONFIG with config/fs-type for the
    supported boot devices
  imx6dlsabresd: set up UBOOT_CONFIG with config/fs-type for the
    supported boot devices
  imx6qsabreauto: set up UBOOT_CONFIG with config/fs-type for the
    supported boot devices
  imx6qsabresd: set up UBOOT_CONFIG with config/fs-type for the
    supported boot devices
  imx6solosabreauto: set up UBOOT_CONFIG with config/fs-type for the
    supported boot devices
  imx6solosabresd: set up UBOOT_CONFIG with config/fs-type for the
    supported boot devices
  imx28evk: set up UBOOT_CONFIG with config/fs-type for the supported
    boot devices

Otavio Salvador (24):
  imx-base.inc: Drop gst-fsl-plugin for vf60 SoC family
  fsl-dynamic-packagearch.bbclass: Dynamically set package architecture
  xf86-input-evdev: Drop PACKAGE_ARCH override
  imx-base.inc: Use 'fsl-dynamic-packagearch' class
  mxs-base.inc: Use 'fsl-dynamic-packagearch' class
  qt4: Remove redundant PACKAGE_ARCH setting
  qt5: Remove redundant PACKAGE_ARCH setting
  mesa-demos: Remove redundant PACKAGE_ARCH setting
  mesa: Remove redundant PACKAGE_ARCH setting
  amd-gpu-mx51.inc: Remove redundant PACKAGE_ARCH setting
  gpu-viv-bin-mx6q.inc: Remove redundant PACKAGE_ARCH setting
  gpu-viv-g2d.inc: Remove redundant PACKAGE_ARCH setting
  imx-test: Remove redundant PACKAGE_ARCH setting
  imx-lib: Remove redundant PACKAGE_ARCH setting
  fsl-alsa-plugins: Remove redundant PACKAGE_ARCH setting
  gst-fsl-plugin.inc: Remove redundant PACKAGE_ARCH setting
  firmware-imx: Use MACHINE_SOCARCH for PACKAGE_ARCH
  libdrm: Use MACHINE_SOCARCH for PACKAGE_ARCH
  xf86-video-imxfb-vivante: Use MACHINE_SOCARCH for PACKAGE_ARCH
  gst-plugins-gl: Use MACHINE_SOCARCH for PACKAGE_ARCH
  gst-plugins-base: Use MACHINE_SOCARCH for PACKAGE_ARCH
  libfslcodec.inc: Use MACHINE_SOCARCH for PACKAGE_ARCH
  libfslparser.inc: Use MACHINE_SOCARCH for PACKAGE_ARCH
  libfslvpuwrap: Use MACHINE_SOCARCH for PACKAGE_ARCH

 classes/fsl-dynamic-packagearch.bbclass            | 47 ++++++++++++++++++++++
 conf/machine/imx28evk.conf                         |  6 ++-
 conf/machine/imx6dlsabreauto.conf                  |  7 +++-
 conf/machine/imx6dlsabresd.conf                    |  3 +-
 conf/machine/imx6qsabreauto.conf                   |  6 ++-
 conf/machine/imx6qsabresd.conf                     |  4 +-
 conf/machine/imx6solosabreauto.conf                |  7 +++-
 conf/machine/imx6solosabresd.conf                  |  5 ++-
 conf/machine/include/imx-base.inc                  | 15 +++++++
 conf/machine/include/mxs-base.inc                  | 10 +++++
 qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend     |  3 --
 qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend     |  3 --
 recipes-bsp/firmware-imx/firmware-imx.inc          |  2 +-
 recipes-bsp/imx-lib/imx-lib_11.09.01.bb            |  1 -
 recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb         |  1 -
 recipes-bsp/imx-test/imx-test.inc                  |  2 -
 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc  |  4 +-
 recipes-graphics/drm/libdrm_2.4.46.bbappend        |  2 +-
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc          |  1 -
 recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc       |  1 -
 recipes-graphics/mesa/mesa-demos_8.1.0.bbappend    |  1 -
 recipes-graphics/mesa/mesa_9.1.6.bbappend          |  3 --
 .../xorg-driver/xf86-input-evdev_2.8.1.bbappend    |  3 --
 ...xf86-video-imxfb-vivante_3.5.7-1.0.0-alpha.2.bb |  2 +-
 recipes-multimedia/alsa/fsl-alsa-plugins_1.0.25.bb |  1 -
 recipes-multimedia/gst-plugins/gst-fsl-plugin.inc  |  2 -
 .../gst-plugins/gst-plugins-base_0.10.36.bbappend  |  6 +--
 .../gstreamer/gst-plugins-gl_0.10.3.bbappend       |  2 +-
 recipes-multimedia/libfslcodec/libfslcodec.inc     |  2 +-
 recipes-multimedia/libfslparser/libfslparser.inc   |  3 +-
 .../libfslvpuwrap/libfslvpuwrap_1.0.38.bb          |  2 +-
 recipes-qt/qt4/qt4-embedded_4.8.5.bbappend         |  2 -
 recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend         |  2 -
 33 files changed, 114 insertions(+), 47 deletions(-)
 create mode 100644 classes/fsl-dynamic-packagearch.bbclass
 delete mode 100644 recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bbappend

-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 01/31] imx6dlsabreauto: set up UBOOT_CONFIG with config/fs-type for the supported boot devices

[Otavio Salvador]

From: Mario Domenech Goulart <mario@ossystems.com.br>

Supported boot devices: sd, eimnor, nand and spinor.

Change-Id: I7d762689582221489d53819b0cde0b3356230d75
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/imx6dlsabreauto.conf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index 9f44316..bf31b4d 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -9,5 +9,10 @@ SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
-UBOOT_MACHINE = "mx6dlsabreauto_config"
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"
+UBOOT_CONFIG[eimnor] = "mx6dlsabreauto_eimnor_config"
+UBOOT_CONFIG[nand] = "mx6dlsabreauto_nand_config,ubifs"
+UBOOT_CONFIG[spinor] = "mx6dlsabreauto_spinor_config"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 02/31] imx6dlsabresd: set up UBOOT_CONFIG with config/fs-type for the supported boot devices

[Otavio Salvador]

From: Mario Domenech Goulart <mario@ossystems.com.br>

Supported boot devices: sd.

Change-Id: I6028f47d170015f8c8aac113773e24ced34e38a0
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/imx6dlsabresd.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index 2797c7c..1230265 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -9,4 +9,5 @@ SOC_FAMILY = "mx6:mx6dl"
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb"
 
-UBOOT_MACHINE = "mx6dlsabresd_config"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 03/31] imx6qsabreauto: set up UBOOT_CONFIG with config/fs-type for the supported boot devices

[Otavio Salvador]

From: Mario Domenech Goulart <mario@ossystems.com.br>

Supported boot devices: sd, eimnor, nand and spinor.

Change-Id: I613abc2ae5e5fe67c59f4aa1466ff1d879532725
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/imx6qsabreauto.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index aa1fbb6..4d367db 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -9,4 +9,8 @@ SOC_FAMILY = "mx6:mx6q"
 
 KERNEL_DEVICETREE = "imx6q-sabreauto.dtb"
 
-UBOOT_MACHINE = "mx6qsabreauto_config"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"
+UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config"
+UBOOT_CONFIG[nand] = "mx6qsabreauto_nand_config,ubifs"
+UBOOT_CONFIG[spinor] = "mx6qsabreauto_spinor_config"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 04/31] imx6qsabresd: set up UBOOT_CONFIG with config/fs-type for the supported boot devices

[Otavio Salvador]

From: Mario Domenech Goulart <mario@ossystems.com.br>

Supported boot devices: sd and sata.

Change-Id: I66a3a5fcfa8624d1aba35003a873ba3a3bb1dcaf
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/imx6qsabresd.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index 15d780b..f0eff4a 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -9,4 +9,6 @@ SOC_FAMILY = "mx6:mx6q"
 
 KERNEL_DEVICETREE = "imx6q-sabresd.dtb"
 
-UBOOT_MACHINE = "mx6qsabresd_config"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"
+UBOOT_CONFIG[sata] = "mx6qsabresd_sata_config"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 05/31] imx6solosabreauto: set up UBOOT_CONFIG with config/fs-type for the supported boot devices

[Otavio Salvador]

From: Mario Domenech Goulart <mario@ossystems.com.br>

Supported boot devices: sd, eimnor, nand and spinor.

Change-Id: I9f4fbfc5c2331a2f2ec20cec2c7ea158f84dae2e
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/imx6solosabreauto.conf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index 2e12934..c2f5fac 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/conf/machine/imx6solosabreauto.conf
@@ -9,5 +9,10 @@ SOC_FAMILY = "mx6:mx6s"
 
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 
-UBOOT_MACHINE = " mx6solosabreauto_config"
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard"
+UBOOT_CONFIG[eimnor] = "mx6solosabreauto_eimnor_config"
+UBOOT_CONFIG[nand] = "mx6solosabreauto_nand_config,ubifs"
+UBOOT_CONFIG[spinor] = "mx6solosabreauto_spinor_config"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 06/31] imx6solosabresd: set up UBOOT_CONFIG with config/fs-type for the supported boot devices

[Otavio Salvador]

From: Mario Domenech Goulart <mario@ossystems.com.br>

Supported boot devices: sd and sata

Change-Id: Ic4f72275dc37da9f882ba51b234c1a1b4e6b2d4f
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/imx6solosabresd.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index 44031a8..c9e7dd0 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/conf/machine/imx6solosabresd.conf
@@ -9,5 +9,8 @@ SOC_FAMILY = "mx6:mx6s"
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb"
 
-UBOOT_MACHINE = " mx6solosabresd_config"
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard"
+UBOOT_CONFIG[sata] = "mx6solosabresd_sata_config"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 07/31] imx28evk: set up UBOOT_CONFIG with config/fs-type for the supported boot devices

[Otavio Salvador]

From: Mario Domenech Goulart <mario@ossystems.com.br>

Supported boot devices: sd, nand and sd-auart-console.

Change-Id: I4521bbfa7a3c5ec4002a583b682a36ab18e9357a
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/imx28evk.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index e38341a..2fe546c 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -8,7 +8,11 @@ include conf/machine/include/mxs-base.inc
 SOC_FAMILY = "mxs:mx28"
 
 IMXBOOTLETS_MACHINE = "iMX28_EVK"
-UBOOT_MACHINE = "mx28evk_config"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
+UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
+UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
 
 KERNEL_IMAGETYPE = "uImage"
 KERNEL_DEVICETREE = "imx28-evk.dtb"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 08/31] imx-base.inc: Drop gst-fsl-plugin for vf60 SoC family

[Otavio Salvador]

The vf60 SoC family does not has VPU so we shouldn't include the
gst-fsl-plugin. We fix it making an override for the SoC family as
done for 'mx3' one.

Change-Id: I2eadf16b67cafc8b91e4968b6108ce4c90f7e284
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/imx-base.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d8d0771..7297331 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -61,6 +61,7 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
 # Gstreamer plugin
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
 MACHINE_GSTREAMER_PLUGIN_mx3 ?= ""
+MACHINE_GSTREAMER_PLUGIN_vf60 ?= ""
 
 # mx5 GPU libraries
 PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 09/31] fsl-dynamic-packagearch.bbclass: Dynamically set package architecture

[Otavio Salvador]

This allow to easy reuse of binary packages among similar SoCs. The
usual use for this is to share SoC specific packages among different
boards. The class can be used to share GPU packages for i.MX53 boards
(as all them share the AMD GPU) and i.MX6 based boards (as all them
share Vivante GPU).

It inspects the database and identify if the package provides or
depends on one of subarch provided values and if it does, it sets the
PACKAGE_ARCH for MACHINE_SUBARCH value otherwise if it matches in the
machine specific filter, it sets it to MACHINE_ARCH.

This reduces the amount of packages we build, for example in case of
core-image-x11 we:

$ ls -l tmp/deploy/rpm/cortexa9hf_vfp_neon_mx6/*.rpm | wc -l
75

So we reuse 75 binaries; these would be build otherwise.

It being dynamically set or statically set it has following benefits:

* correctness: it is easier to ensure the system behaves as expected
* correctness for non-tracked recipes: new recipes, if depending on
  virtual/kernel or GPU has the right architecture choosen, without a
  .bbappend file for them
* safeness: non-expert users get a more adequate behavior as the
  complexity of choosing the right architecture is simplified for them
* easy maintenance: it is easier for me, as maintainer, to maintain a
  code which decides what to do than having hundreds of bbappend files
  for it

Change-Id: Icb0a8060e862c8eeb166c45d1b39c40de07b01d8
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/fsl-dynamic-packagearch.bbclass | 47 +++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 classes/fsl-dynamic-packagearch.bbclass

diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
new file mode 100644
index 0000000..def8e71
--- /dev/null
+++ b/classes/fsl-dynamic-packagearch.bbclass
@@ -0,0 +1,47 @@
+# Automatically set PACKAGE_ARCH for MACHINE_SOCARCH
+#
+# This allow to easy reuse of binary packages among similar SoCs. The
+# usual use for this is to share SoC specific packages among different
+# boards.
+#
+# MACHINE_SOCARCH_FILTER list all packages associated with
+# MACHINE_SOCARCH and, when match, will set PACHAGE_ARCH as MACHINE_SOCARCH
+#
+# MACHINE_ARCH_FILTER list all packages associated with
+# MACHINE_ARCH and, when match, will set PACHAGE_ARCH as MACHINE_ARCH
+#
+# For example, in meta-fsl-arm, this is used to share GPU packages for
+# i.MX53 boards (as all them share the AMD GPU) and i.MX6 based boards
+# (as all them share Vivante GPU).
+#
+# To use the class, specify, for example:
+#
+# MACHINE_SOCARCH_soc = "${TUNE_PKGARCH}-soc"
+#
+# and the need filters, as:
+#
+# MACHINE_ARCH_FILTER = "virtual/kernel"
+# MACHINE_SOCARCH_FILTER_soc = "virtual/libgles1 ... virtual/libgl"
+#
+# Copyright 2013 (C) O.S. Systems Software LTDA.
+
+python __anonymous () {
+    machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split())
+    machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER", True) or "").split())
+    if machine_socarch_filter or machine_arch_filter:
+        provides = set((d.getVar("PROVIDES", True) or "").split())
+        depends = set((d.getVar("DEPENDS", True) or "").split())
+        PN = d.getVar("PN", True)
+
+        package_arch = None
+        if list(machine_arch_filter & (provides | depends)):
+            package_arch = d.getVar("MACHINE_ARCH", True)
+        elif list(machine_socarch_filter & (provides | depends)):
+            package_arch = d.getVar("MACHINE_SOCARCH", True)
+            if not package_arch:
+                bb.parse.SkipPackage("You must set MACHINE_SOCARCH as MACHINE_SOCARCH_FILTER is set for this SoC.")
+
+        if package_arch:
+            bb.debug(1, "Use '%s' as package archictecture for '%s'" % (package_arch, PN))
+            d.setVar("PACKAGE_ARCH", package_arch)
+}
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 10/31] xf86-input-evdev: Drop PACKAGE_ARCH override

[Otavio Salvador]

The Xorg 1.11.4 version has been dropped so we don't have an ABI
incompatible Xorg anymore and we now use the Xorg in sync with
OE-Core/Poky so this is not need anymore.

Change-Id: I8c9b1f4f233f41ff2644bd3c50c657148633e17d
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bbappend | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bbappend

diff --git a/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bbappend b/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bbappend
deleted file mode 100644
index 40cde27..0000000
--- a/recipes-graphics/xorg-driver/xf86-input-evdev_2.8.1.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# We use 1.11.4 Xorg version for i.MX6 and it has different ABI so
-# make it machine specific
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 11/31] imx-base.inc: Use 'fsl-dynamic-packagearch' class

[Otavio Salvador]

Change-Id: I61f115780b3f9b3518e3af45f278e4602b192d1a
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/imx-base.inc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 7297331..f5fa6ce 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -33,6 +33,20 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 # Float-Point setting
 DEFAULTTUNE_mx6 ?= "cortexa9hf-neon"
 
+# Sub-architecture support
+MACHINE_SOCARCH ?= ""
+MACHINE_SOCARCH_mx3 = "${TUNE_PKGARCH}-mx3"
+MACHINE_SOCARCH_mx5 = "${TUNE_PKGARCH}-mx5"
+MACHINE_SOCARCH_mx6 = "${TUNE_PKGARCH}-mx6"
+MACHINE_SOCARCH_vf60 = "${TUNE_PKGARCH}-vf60"
+PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
+
+MACHINE_ARCH_FILTER = "virtual/kernel"
+MACHINE_SOCARCH_FILTER_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
+MACHINE_SOCARCH_FILTER_mx6 = "virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
+
+INHERIT += "fsl-dynamic-packagearch"
+
 # Firmware
 MACHINE_FIRMWARE ?= ""
 MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 12/31] mxs-base.inc: Use 'fsl-dynamic-packagearch' class

[Otavio Salvador]

Change-Id: I86c77a6aa19ee40b151246bb9531ff7194a4b983
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/mxs-base.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index c0681f7..108255e 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -22,6 +22,16 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"
 
+# Sub-architecture support
+MACHINE_SOCARCH ?= ""
+MACHINE_SOCARCH_mx23 = "${TUNE_PKGARCH}-mx23"
+MACHINE_SOCARCH_mx28 = "${TUNE_PKGARCH}-mx28"
+PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
+
+MACHINE_ARCH_FILTER = "virtual/kernel"
+
+INHERIT += "fsl-dynamic-packagearch"
+
 # Ship kernel modules
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 13/31] qt4: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
GPU libraries.

Change-Id: Id16d6160b08ea054d528d0b251031f0532ed2938
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 2 --
 recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 2 --
 2 files changed, 4 deletions(-)

diff --git a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
index 007f89b..a9330bf 100644
--- a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
+++ b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
@@ -2,11 +2,9 @@
 include qt4-phonon-patches.inc
 
 DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
-PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
 QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
 DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2"
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx6 = "-opengl es2 -openvg"
 QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/ -DLINUX=1 -DEGL_API_FB=1"
diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
index 007f89b..a9330bf 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
+++ b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
@@ -2,11 +2,9 @@
 include qt4-phonon-patches.inc
 
 DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
-PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
 QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
 DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2"
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx6 = "-opengl es2 -openvg"
 QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/ -DLINUX=1 -DEGL_API_FB=1"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 14/31] qt5: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
GPU libraries.

Change-Id: I0d14dce02fc5263a403ad3b0b55b1e67ccae0c5a
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend | 3 ---
 qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend
index 33f0e8b..1670f19 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend
@@ -18,9 +18,6 @@ QT_TSLIB_mx6 = "-tslib"
 TSLIB_DEPENDS_mx5 = "tslib"
 QT_TSLIB_mx5 = "-tslib"
 
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
-
 FILESEXTRAPATHS_prepend_mx5 := "${THISDIR}/${PN}:"
 SRC_URI_append_mx5 += " \
     file://qeglfshooks_imx5.cpp \
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend
index 33f0e8b..1670f19 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend
@@ -18,9 +18,6 @@ QT_TSLIB_mx6 = "-tslib"
 TSLIB_DEPENDS_mx5 = "tslib"
 QT_TSLIB_mx5 = "-tslib"
 
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
-
 FILESEXTRAPATHS_prepend_mx5 := "${THISDIR}/${PN}:"
 SRC_URI_append_mx5 += " \
     file://qeglfshooks_imx5.cpp \
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 15/31] mesa-demos: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
GPU libraries.

Change-Id: I172c119d66774df90dcd2a8a649bc2d8191e701f
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/mesa/mesa-demos_8.1.0.bbappend | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend b/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend
index 666fc61..989577d 100644
--- a/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend
@@ -2,4 +2,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch"
 
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 16/31] mesa: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
GPU libraries.

Change-Id: I5d2b23fb31f17becc10a7c5955aee9ff4d940a17
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/mesa/mesa_9.1.6.bbappend | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/recipes-graphics/mesa/mesa_9.1.6.bbappend b/recipes-graphics/mesa/mesa_9.1.6.bbappend
index 5b3c927..9975abc 100644
--- a/recipes-graphics/mesa/mesa_9.1.6.bbappend
+++ b/recipes-graphics/mesa/mesa_9.1.6.bbappend
@@ -32,9 +32,6 @@ python __anonymous () {
                 new_provides.append(i)
 
         d.setVar('PROVIDES', ' '.join(new_provides))
-
-        # We are now machine specific
-        d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH'))
 }
 
 # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 17/31] amd-gpu-mx51.inc: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
GPU libraries.

Change-Id: I9315d48f5da96b2980666f21ab73e55db3e8b8c6
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
index ee6c48f..3ff5d4b 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2012 Freescale
+# Copyright (C) 2011, 2012, 2013 Freescale
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 LICENSE = "Proprietary"
@@ -80,5 +80,3 @@ FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
 
 FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
 FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 18/31] gpu-viv-bin-mx6q.inc: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
GPU libraries.

Change-Id: Iafacf04fc9299b3e55b01f15b6aa02a728e356da
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 8a3efaf..431859a 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -235,5 +235,4 @@ FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS
 
 FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 19/31] gpu-viv-g2d.inc: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
GPU libraries.

Change-Id: I812549fa9982f87ef9d6998623be9557cb731811
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc b/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
index a6b7a5e..f044a76 100644
--- a/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
+++ b/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
@@ -39,5 +39,4 @@ FILES_${PN} = "/opt ${libdir}/libg2d${SOLIBS} "
 FILES_${PN}-dev = "${includedir}"
 FILES_${PN}-dbg = "${libdir}/.debug/libg2d${SOLIBS}"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 20/31] imx-test: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
kernel.

Change-Id: I4ae950e38e50d75bc0a6e14aabedd7d3102eff65
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-test/imx-test.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index b5535d6..d8aa99d 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -40,5 +40,3 @@ do_install() {
 
 FILES_${PN} += "/unit_tests"
 FILES_${PN}-dbg += "/unit_tests/.debug"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 21/31] imx-lib: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
kernel.

Change-Id: I880147182edf7023747fb7d756a2eab2a54b3071
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-lib/imx-lib_11.09.01.bb    | 1 -
 recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb | 1 -
 2 files changed, 2 deletions(-)

diff --git a/recipes-bsp/imx-lib/imx-lib_11.09.01.bb b/recipes-bsp/imx-lib/imx-lib_11.09.01.bb
index 164cb03..37e6628 100644
--- a/recipes-bsp/imx-lib/imx-lib_11.09.01.bb
+++ b/recipes-bsp/imx-lib/imx-lib_11.09.01.bb
@@ -9,5 +9,4 @@ SRC_URI += " file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.pa
 SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c"
 SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx5)"
diff --git a/recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb b/recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb
index ca19dc0..bfb1984 100644
--- a/recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb
+++ b/recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb
@@ -8,5 +8,4 @@ SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.bin;fsl-eula=true"
 SRC_URI[md5sum] = "70248d0932a6d2808701166f41b1708f"
 SRC_URI[sha256sum] = "ad746e34cf7d8cd9cb3f3f6c8eda85d9fa314fc6f57502d1f9cb454c5fab2f9d"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 22/31] fsl-alsa-plugins: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
kernel.

Change-Id: I9b702584af1576c8a816943a7690356575245398
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-multimedia/alsa/fsl-alsa-plugins_1.0.25.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-multimedia/alsa/fsl-alsa-plugins_1.0.25.bb b/recipes-multimedia/alsa/fsl-alsa-plugins_1.0.25.bb
index 3fa01b4..81265ef 100644
--- a/recipes-multimedia/alsa/fsl-alsa-plugins_1.0.25.bb
+++ b/recipes-multimedia/alsa/fsl-alsa-plugins_1.0.25.bb
@@ -23,5 +23,4 @@ FILES_${PN} += "${libdir}/alsa-lib/libasound_*.so"
 FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug"
 FILES_${PN}-dev += "${libdir}/alsa-lib/*.la"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 23/31] gst-fsl-plugin.inc: Remove redundant PACKAGE_ARCH setting

[Otavio Salvador]

The PACKAGE_ARCH is now dynamically set for package which depends on
kernel.

Change-Id: I86c4f50af09cd2879eae749cb3c694657796cf0a
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-multimedia/gst-plugins/gst-fsl-plugin.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc b/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
index e744172..59a426d 100644
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
@@ -59,5 +59,3 @@ FILES_${PN}-libme = "${libdir}/libme${SOLIBS}"
 FILES_${PN}-libgstbufmeta = "${libdir}/libgstbufmeta${SOLIBS}"
 FILES_${PN}-libmfwba =  "${libdir}/libmfwba${SOLIBS}"
 FILES_${PN}-libfwvss = "${libdir}/libmfwvss${SOLIBS}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 24/31] firmware-imx: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The firmware-imx is common to the soc-architecture so we ought to
reflect this in the PACKAGE_ARCH setting.

Change-Id: Ib8c45fd2589e7a7fa10275021152ae7f951bf51e
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/firmware-imx/firmware-imx.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 3ae30d9..0f49937 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -44,4 +44,4 @@ ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 25/31] libdrm: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The libdrm is common to the soc-architecture so we ought to
reflect this in the PACKAGE_ARCH setting.

Change-Id: I1b33ee5e24b34639db8ad10517dadd1a74d2e2fb
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/drm/libdrm_2.4.46.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-graphics/drm/libdrm_2.4.46.bbappend b/recipes-graphics/drm/libdrm_2.4.46.bbappend
index 8c8ea6b..1ef3340 100644
--- a/recipes-graphics/drm/libdrm_2.4.46.bbappend
+++ b/recipes-graphics/drm/libdrm_2.4.46.bbappend
@@ -2,4 +2,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mx6 = "file://drm-update-arm.patch"
 
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 26/31] xf86-video-imxfb-vivante: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The xf86-video-imxfb-vivante is common to the soc-architecture so we
ought to reflect this in the PACKAGE_ARCH setting.

Change-Id: Ia011bbb11264a8daaa50e2988008d0f4bfc8b400
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xorg-driver/xf86-video-imxfb-vivante_3.5.7-1.0.0-alpha.2.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.5.7-1.0.0-alpha.2.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.5.7-1.0.0-alpha.2.bb
index c65ad27..35a5759 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.5.7-1.0.0-alpha.2.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.5.7-1.0.0-alpha.2.bb
@@ -55,5 +55,5 @@ RDEPENDS_${PN} += "libvivante-dri-mx6 \
                    xserver-xorg-extension-dri2 \
                    xserver-xorg-extension-glx"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 27/31] gst-plugins-gl: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The gst-plugins-gl is common to the soc-architecture so we ought to
reflect this in the PACKAGE_ARCH setting.

Change-Id: Ic295cf8d438a5e83924c79eb94ce19676f8b580f
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend b/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend
index 51eb457..2388c34 100644
--- a/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend
+++ b/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bbappend
@@ -9,4 +9,4 @@ SRC_URI_append_mx6 = " file://IMX_MMCODEC_3.0.35_4.0.0.patch"
 
 CFLAGS_append_mx6 = " -DGLIB_DISABLE_DEPRECATION_WARNINGS -UG_DISABLE_DEPRECATED"
 
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 28/31] gst-plugins-base: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The gst-plugins-base is common to the soc-architecture so we ought to
reflect this in the PACKAGE_ARCH setting.

Change-Id: I8733f145be5a002806fce9449d89745b8654ccfd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend b/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend
index ac420ce..3da2507 100644
--- a/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend
+++ b/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend
@@ -7,6 +7,6 @@ SRC_URI_append_mxs = " file://gstplaybin2-rawvideo-support.patch"
 SRC_URI_append_mx5 = " file://gstplaybin2-rawvideo-support.patch"
 SRC_URI_append_mx6 = " file://gstplaybin2-rawvideo-support.patch"
 
-PACKAGE_ARCH_mxs = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mxs = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH_mx5 = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 29/31] libfslcodec.inc: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The libfslcodec is common to the soc-architecture so we ought to
reflect this in the PACKAGE_ARCH setting.

Change-Id: I050037f7f3c004bf882a78c58b6e2d4fe42fe6c6
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-multimedia/libfslcodec/libfslcodec.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/libfslcodec/libfslcodec.inc b/recipes-multimedia/libfslcodec/libfslcodec.inc
index ad44eb1..5ba32c0 100644
--- a/recipes-multimedia/libfslcodec/libfslcodec.inc
+++ b/recipes-multimedia/libfslcodec/libfslcodec.inc
@@ -63,4 +63,4 @@ FILES_${PN}-dev += "${libdir}/imx-mm/*/*${SOLIBSDEV} \
 # FIXME: The wrap and lib names does not match
 FILES_${PN}-oggvorbis += "${libdir}/imx-mm/audio-codec/wrap/lib_vorbisd_wrap_arm*_elinux.so.*"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 30/31] libfslparser.inc: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The libfslparser is common to the soc-architecture so we ought to
reflect this in the PACKAGE_ARCH setting.

Change-Id: I3d24eedd4aecdf4c8d39f86ac95acd27580da1e9
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-multimedia/libfslparser/libfslparser.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-multimedia/libfslparser/libfslparser.inc b/recipes-multimedia/libfslparser/libfslparser.inc
index fa30530..25b1b25 100644
--- a/recipes-multimedia/libfslparser/libfslparser.inc
+++ b/recipes-multimedia/libfslparser/libfslparser.inc
@@ -22,5 +22,4 @@ python populate_packages_prepend() {
 # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
 FILES_${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-- 
1.8.4.rc3

[meta-fsl-arm PATCH v2 31/31] libfslvpuwrap: Use MACHINE_SOCARCH for PACKAGE_ARCH

[Otavio Salvador]

The libfslvpuwrap is common to the soc-architecture so we ought to
reflect this in the PACKAGE_ARCH setting.

Change-Id: I31925fc7efa910948e496cca1c8118cc73d11e97
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.38.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.38.bb b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.38.bb
index 7b9e14c..746d61c 100644
--- a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.38.bb
+++ b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.38.bb
@@ -22,5 +22,5 @@ do_install_append() {
     rm -r ${D}${datadir}/imx-mm
 }
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
-- 
1.8.4.rc3