aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-07-01 11:15:40 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-09-08 11:24:24 -0300
commit6de06b07e594e3642fc97cafbcd1b98e231b2f39 (patch)
tree0cbb43d5327ea1875d1a89121c1f1c71867d7bcd /conf
parentc23736b343f1ee549870584b8f53f085deabffe4 (diff)
downloadmeta-freescale-6de06b07e594e3642fc97cafbcd1b98e231b2f39.tar.gz
meta-freescale-6de06b07e594e3642fc97cafbcd1b98e231b2f39.tar.bz2
meta-freescale-6de06b07e594e3642fc97cafbcd1b98e231b2f39.zip
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>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx23evk.conf4
-rw-r--r--conf/machine/imx28evk.conf4
-rw-r--r--conf/machine/imx51evk.conf4
-rw-r--r--conf/machine/imx53ard.conf4
-rw-r--r--conf/machine/imx53qsb.conf4
-rw-r--r--conf/machine/imx6dlsabreauto.conf4
-rw-r--r--conf/machine/imx6dlsabresd.conf4
-rw-r--r--conf/machine/imx6qpsabreauto.conf4
-rw-r--r--conf/machine/imx6qpsabresd.conf4
-rw-r--r--conf/machine/imx6qsabreauto.conf4
-rw-r--r--conf/machine/imx6qsabresd.conf4
-rw-r--r--conf/machine/imx6slevk.conf4
-rw-r--r--conf/machine/imx6solosabreauto.conf4
-rw-r--r--conf/machine/imx6solosabresd.conf4
-rw-r--r--conf/machine/imx6sxsabreauto.conf4
-rw-r--r--conf/machine/imx6sxsabresd.conf4
-rw-r--r--conf/machine/imx6ulevk.conf4
-rw-r--r--conf/machine/imx7dsabresd.conf4
-rw-r--r--conf/machine/include/imx-base.inc2
-rw-r--r--conf/machine/ls1021atwr.conf4
-rw-r--r--conf/machine/twr-vf65gs10.conf4
21 files changed, 40 insertions, 42 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 6ec1f14f..6c4daa5c 100644
--- 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 ac4cef59..5bdbcade 100644
--- 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 9d7d06ca..e6904f9e 100644
--- 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 c338d6b5..f416c954 100644
--- 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 5df85a9e..dc264c4a 100644
--- 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 a9bdfe5e..3df479b5 100644
--- 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 f832666e..99432462 100644
--- 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 b2273389..f8e914a6 100644
--- 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 2e7ee474..123a4358 100644
--- 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 3429551e..e25a7330 100644
--- 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 8115dfa8..33fff89c 100644
--- 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 98402f7e..02cb8f03 100644
--- 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 ead787d0..3ced78d3 100644
--- 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 b123d8ce..24fa6496 100644
--- 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 9c8a01ff..4f399a39 100644
--- 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 2243d1fc..857b7350 100644
--- 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 8e2fef06..7ab0963e 100644
--- 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 673207f2..5d74997b 100644
--- 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 1d7993c5..a6db0382 100644
--- 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 1ba49922..8006885c 100644
--- 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 dd5a21a2..c14ee5ba 100644
--- 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"