diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index b9b0908da..acf4a160e 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -13,6 +13,17 @@ XSERVER = "xserver-xorg \
 # Ship kernel modules
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
+# Sub-architecture support
+MACHINE_SOCARCH ?= ""
+MACHINE_SOCARCH_mx5 = "${TUNE_PKGARCH}-mx5"
+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"
+
 # Gstreamer plugin
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
 
diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
index 90451a5d6..dfcc290ef 100644
--- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
@@ -10,6 +10,15 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"
 
+# Sub-architecture support
+MACHINE_SOCARCH ?= ""
+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"