Convert SOC_FAMILY to MACHINEOVERRIDES

The SOC_FAMILY is an indirection which makes the understanding, from
OpenEmbedded versed developers and users, more difficult. Instead of
using the SOC_FAMILY indirection which is rarely used, we now move to
the MACHINEOVERRIDES mechanism as this is in fact what is in use.

Change-Id: Ic6e58b79bdc990ac853c87761c3fff635786e4e5
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 6ec1f14ff31d15b24a92b57b21a2cec88306d647..6c4daa5ca6824a500757da3e4fd91c3ec7fb2de3 100644 (file)
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -4,11 +4,11 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX23 Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
+MACHINEOVERRIDES =. "mxs:mx23:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-arm926ejs.inc
 
-SOC_FAMILY = "mxs:mx23"
-
 IMXBOOTLETS_MACHINE = "stmp378x_dev"
 UBOOT_MACHINE = "mx23evk_config"
 

diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index ac4cef59eb733c1969658d896a727d35bed5452f..5bdbcade1f8fb835de4211d37cad1e04fb484589 100644 (file)
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -4,11 +4,11 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
+MACHINEOVERRIDES =. "mxs:mx28:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-arm926ejs.inc
 
-SOC_FAMILY = "mxs:mx28"
-
 IMXBOOTLETS_MACHINE = "iMX28_EVK"
 
 UBOOT_CONFIG ??= "sd"

diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 9d7d06ca41fc6236a3d53795ffd39e29f93603d2..e6904f9e04f7e4c730cb09bf6ab58b79501628c0 100644 (file)
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -4,11 +4,11 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit
 #@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
 
+MACHINEOVERRIDES =. "mx5:mx51:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
-SOC_FAMILY = "mx5:mx51"
-
 # Disable perf features as 2.6.35.3 fails to build otherwise
 PERF_FEATURES_ENABLE = ""
 

diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index c338d6b5138b159c3c43205d2a2e0139f4114eeb..f416c954cf3aa4ebd29cfec5fca9d83ffb154981 100644 (file)
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -4,11 +4,11 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive Board
 #@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
 
+MACHINEOVERRIDES =. "mx5:mx53:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
-SOC_FAMILY = "mx5:mx53"
-
 # Disable perf features as 2.6.35.3 fails to build otherwise
 PERF_FEATURES_ENABLE = ""
 

diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 5df85a9e2c5bf5c7ba2449676008156b5492ff07..dc264c4a786b950a6333846400466276ad1520ef 100644 (file)
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -4,11 +4,11 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board
 #@MAINTAINER: Trevor Woerner <trevor.woerner@linaro.org>
 
+MACHINEOVERRIDES =. "mx5:mx53:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
-SOC_FAMILY = "mx5:mx53"
-
 KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
 
 UBOOT_MACHINE = "mx53loco_config"

diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index a9bdfe5ecbdbbcdb17d6c0300734be956d3099cd..3df479b5ade3ea99f0a3f7502ada8bafddf8a144 100644 (file)
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive
 #@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
 
-require conf/machine/include/imx6sabreauto-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
 
-SOC_FAMILY = "mx6:mx6dl"
+require conf/machine/include/imx6sabreauto-common.inc
 
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
                      imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb"

diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index f832666e9fab7edf3325a7be68f5758a4548231f..994324624462b402146264fd32eedb2b0e4bed0a 100644 (file)
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
-require conf/machine/include/imx6sabresd-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
 
-SOC_FAMILY = "mx6:mx6dl"
+require conf/machine/include/imx6sabresd-common.inc
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
                      imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb"

diff --git a/conf/machine/imx6qpsabreauto.conf b/conf/machine/imx6qpsabreauto.conf
index b2273389120bee56c07c0396b0e16a56a6c4b0d5..f8e914a661322dfcddec87d7b38808dae318a15b 100644 (file)
--- a/conf/machine/imx6qpsabreauto.conf
+++ b/conf/machine/imx6qpsabreauto.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Automotive
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
-require conf/machine/include/imx6sabreauto-common.inc
+MACHINEOVERRIDES =. "mx6:mx6q:"
 
-SOC_FAMILY = "mx6:mx6q"
+require conf/machine/include/imx6sabreauto-common.inc
 
 KERNEL_DEVICETREE = "imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \
                      imx6qp-sabreauto-gpmi-weim.dtb"

diff --git a/conf/machine/imx6qpsabresd.conf b/conf/machine/imx6qpsabresd.conf
index 2e7ee474e7763a3b988538883f997ea01ddebad1..123a43586b02f8945ff1820eb832bd5db5db0cd6 100644 (file)
--- a/conf/machine/imx6qpsabresd.conf
+++ b/conf/machine/imx6qpsabresd.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Smart Device
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
-require conf/machine/include/imx6sabresd-common.inc
+MACHINEOVERRIDES =. "mx6:mx6q:"
 
-SOC_FAMILY = "mx6:mx6q"
+require conf/machine/include/imx6sabresd-common.inc
 
 KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-ldo.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb"
 

diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index 3429551e69a9ddcac0363326f03815780d00e660..e25a7330bc292a2966ab8688858c368d046cb153 100644 (file)
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive
 #@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
 
-require conf/machine/include/imx6sabreauto-common.inc
+MACHINEOVERRIDES =. "mx6:mx6q:"
 
-SOC_FAMILY = "mx6:mx6q"
+require conf/machine/include/imx6sabreauto-common.inc
 
 KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \
                      imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb"

diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index 8115dfa866cc5d5ece17134409b68e080e442789..33fff89c01ffee56952933d422b2f47c8f9116a9 100644 (file)
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
-require conf/machine/include/imx6sabresd-common.inc
+MACHINEOVERRIDES =. "mx6:mx6q:"
 
-SOC_FAMILY = "mx6:mx6q"
+require conf/machine/include/imx6sabresd-common.inc
 
 KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
                      imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb"

diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 98402f7e77bcec3906bdf63c74d0bd8dfe666a89..02cb8f03b4e80d2e982f0474b4ba88f65c2ade6b 100644 (file)
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -4,11 +4,11 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6SL Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
+MACHINEOVERRIDES =. "mx6:mx6sl:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
-SOC_FAMILY = "mx6:mx6sl"
-
 KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
                      imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb"
 

diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index ead787d00e5113da693f068d42076af2bc8b4140..3ced78d3932d6790d467138c55b25a451a2c77cf 100644 (file)
--- a/conf/machine/imx6solosabreauto.conf
+++ b/conf/machine/imx6solosabreauto.conf
@@ -3,9 +3,9 @@
 #@SOC: i.MX6S
 #@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive
 
-require conf/machine/include/imx6sabresd-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
 
-SOC_FAMILY = "mx6:mx6dl"
+require conf/machine/include/imx6sabresd-common.inc
 
 KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
 

diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index b123d8ce4a7fedc1d0eb158b28f8c9e9be9859e2..24fa6496beb2bc7e1f1ddd4d577adbbf034a634e 100644 (file)
--- a/conf/machine/imx6solosabresd.conf
+++ b/conf/machine/imx6solosabresd.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Smart Device
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
-require conf/machine/include/imx6sabresd-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
 
-SOC_FAMILY = "mx6:mx6dl"
+require conf/machine/include/imx6sabresd-common.inc
 
 KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
 

diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 9c8a01ff94e5306cb141ea4c18cabbd2a722ea3c..4f399a398eac368dd7dfe4f26766d751148af7c7 100644 (file)
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre Automotive
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
-require conf/machine/include/imx6sabreauto-common.inc
+MACHINEOVERRIDES =. "mx6:mx6sx:"
 
-SOC_FAMILY = "mx6:mx6sx"
+require conf/machine/include/imx6sabreauto-common.inc
 
 KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
 

diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 2243d1fcc5bcb8fd4fa30f2d35eceb4d7819bec8..857b73507f33520160c31c50de99ea4b7f848189 100644 (file)
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -4,9 +4,9 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre SD
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
-require conf/machine/include/imx6sabresd-common.inc
+MACHINEOVERRIDES =. "mx6:mx6sx:"
 
-SOC_FAMILY = "mx6:mx6sx"
+require conf/machine/include/imx6sabresd-common.inc
 
 KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
                      imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 8e2fef06ad34da1d3916f69064d65783eb1ccf30..7ab0963eb1b60a821e4f52c540a55da8305091b5 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -4,13 +4,13 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX6UL EVK
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
+MACHINEOVERRIDES =. "mx6ul:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa7.inc
 
 MACHINE_FEATURES += " pci wifi bluetooth"
 
-SOC_FAMILY = "mx6ul"
-
 KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb"
 
 UBOOT_SUFFIX = "img"

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 673207f2e0ae734dece5d3b50d6ea5bd9701b404..5d74997b15ee3ad854ff3e5f8142b85e937a34f8 100644 (file)
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -4,13 +4,13 @@
 #@DESCRIPTION: Machine configuration for Freescale i.MX7D SABRE Smart Device
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
+MACHINEOVERRIDES =. "mx7:mx7d:"
+
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa7.inc
 
 MACHINE_FEATURES += " pci wifi bluetooth"
 
-SOC_FAMILY = "mx7:mx7d"
-
 KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
                      imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \
                      imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 1d7993c58db64ebd7ea1183590c1fc8ae85d8cfb..a6db0382defaaa3b586ebf0f19a00343a187fa2f 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -3,8 +3,6 @@
 include conf/machine/include/fsl-default-settings.inc
 include conf/machine/include/fsl-default-versions.inc
 
-include conf/machine/include/soc-family.inc
-
 # Set specific make target and binary suffix
 PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 1ba4992263a8bd2a91391646bce5e201dba8ab60..8006885c4ef41063db858476478bca3a4ebb2b83 100644 (file)
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -5,13 +5,13 @@
 #              Module Rev2.0 with ARM Cortex-A7 core
 #@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
 
+MACHINEOVERRIDES =. "ls102xa:"
+
 require conf/machine/include/qoriq-arm.inc
 require conf/machine/include/tune-cortexa7.inc
 
 DEFAULTTUNE = "cortexa7hf-neon"
 
-SOC_FAMILY = "ls102xa"
-
 UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
 UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
 UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config"

diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index dd5a21a22d0130c9145acfd0ef2362069b5431c8..c14ee5ba015c2a5a0b4423c58f8a736eda4a1408 100644 (file)
--- a/conf/machine/twr-vf65gs10.conf
+++ b/conf/machine/twr-vf65gs10.conf
@@ -4,11 +4,11 @@
 #@DESCRIPTION: Machine configuration for Freescale Vybrid TWR-VF65GS10
 #@MAINTAINER: Stefan Agner <stefan.agner@toradex.com>
 
+MACHINEOVERRIDES =. "vf:vf60:"
+
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa5.inc
 
-SOC_FAMILY = "vf:vf60"
-
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
 
 UBOOT_MACHINE = "vf610twr_config"

diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index 0efb56451ed635e77ff22a261e380163f3b682fc..5c4a39c8216d718af66077a4da06f27b36ed6059 100644 (file)
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
 
 python __anonymous () {
     families = ['mx6']
-    cur_families = (d.getVar('SOC_FAMILY', True) or '').split(':')
+    cur_families = (d.getVar('MACHINEOVERRIDES', True) or '').split(':')
     if any(map(lambda x: x in cur_families,
                families)):
         d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir')