[meta-freescale] [meta-fsl-arm-extra PATCH] Convert SOC_FAMILY to MACHINEOVERRIDES
Otavio Salvador
otavio at ossystems.com.br
Mon Aug 29 11:23:11 PDT 2016
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.
This change is done to align with the meta-fsl-arm BSP.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
conf/machine/apalis-imx6.conf | 4 ++--
conf/machine/cgtqmx6.conf | 4 ++--
conf/machine/cm-fx6.conf | 4 ++--
conf/machine/colibri-imx6.conf | 4 ++--
conf/machine/colibri-imx7.conf | 4 ++--
conf/machine/colibri-vf.conf | 4 ++--
conf/machine/cubox-i.conf | 11 ++++++-----
conf/machine/imx6q-dms-ba16.conf | 4 ++--
conf/machine/imx6qdl-variscite-som.conf | 4 ++--
conf/machine/imx6sl-warp.conf | 4 ++--
conf/machine/imx6ul-pico-hobbit.conf | 4 ++--
conf/machine/imx7s-warp.conf | 4 ++--
conf/machine/include/cfa10036.inc | 4 ++--
conf/machine/include/imx233-olinuxino.inc | 6 +++---
conf/machine/m28evk.conf | 4 ++--
conf/machine/m53evk.conf | 4 ++--
conf/machine/nitrogen6sx.conf | 4 ++--
conf/machine/nitrogen6x-lite.conf | 4 ++--
conf/machine/nitrogen6x.conf | 4 ++--
conf/machine/nitrogen7.conf | 4 ++--
conf/machine/pcm052.conf | 4 ++--
conf/machine/tx6q-10x0.conf | 4 ++--
conf/machine/tx6q-11x0.conf | 4 ++--
conf/machine/tx6s-8034.conf | 4 ++--
conf/machine/tx6s-8035.conf | 4 ++--
conf/machine/tx6u-8033.conf | 4 ++--
conf/machine/tx6u-80x0.conf | 4 ++--
conf/machine/tx6u-81x0.conf | 4 ++--
conf/machine/ventana.conf | 4 ++--
conf/machine/wandboard.conf | 4 ++--
30 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 553c729..8992047 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM
#@MAINTAINER: Max Krummenacher <max.krummenacher at toradex.com>
+MACHINEOVERRIDES =. "mx6:mx6q:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6q"
-
PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \
imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb"
diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf
index 6a6385b..9411628 100644
--- a/conf/machine/cgtqmx6.conf
+++ b/conf/machine/cgtqmx6.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Congatec QMX6 Evaluation board
#@MAINTAINER: Alex de Cabo <alejandro.de-cabo-garcia at congatec.com>
+MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6dl:mx6q"
-
UBOOT_MAKE_TARGET = ""
UBOOT_SUFFIX = "img"
SPL_BINARY = "SPL"
diff --git a/conf/machine/cm-fx6.conf b/conf/machine/cm-fx6.conf
index 8166b5a..81d1062 100644
--- a/conf/machine/cm-fx6.conf
+++ b/conf/machine/cm-fx6.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for CompuLab CM-FX6 machines
#@MAINTAINER: Valentin Raevsky <valentin at compulab.co.il>
+MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:"
+
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6dl:mx6q"
-
PREFERRED_PROVIDER_u-boot = "u-boot-compulab"
PREFERRED_PROVIDER_virtual/kernel = "linux-compulab"
diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 807cb77..4b02ff1 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Toradex Colibri iMX6 SOM
#@MAINTAINER: Max Krummenacher <max.krummenacher at toradex.com>
+MACHINEOVERRIDES =. "mx6:mx6dl:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6dl"
-
PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb"
KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/colibri-imx7.conf b/conf/machine/colibri-imx7.conf
index 226eef2..87812a2 100644
--- a/conf/machine/colibri-imx7.conf
+++ b/conf/machine/colibri-imx7.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Toradex Colibri iMX7 SOM
#@MAINTAINER: Max Krummenacher <max.krummenacher at toradex.com>
+MACHINEOVERRIDES =. "mx7:mx7d:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
-SOC_FAMILY = "mx7:mx7d"
-
PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE += "imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb"
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index da0da94..3ddef79 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Toradex Colibri VF50/VF61 powered by Freescale Vybrid SoC
#@MAINTAINER: Stefan Agner <stefan.agner at toradex.com>
+MACHINEOVERRIDES =. "vf:vf50:vf60:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa5.inc
-SOC_FAMILY = "vf:vf50:vf60"
-
PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb"
diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
index 1592f93..44e8cfb 100644
--- a/conf/machine/cubox-i.conf
+++ b/conf/machine/cubox-i.conf
@@ -5,15 +5,16 @@
#@MAINTAINER: Carlos Rafael Giani <dv at pseudoterminal.org>
# Machine config for the SolidRun CuBox-i and HummingBoard machines.
-# They all use the same machine config, since the u-boot SPL autodetects the
-# machine type upon booting. SOC_FAMILY includes all SoCs from all of these machines
-# to let recipes include firmware etc. for all of these SoCs.
+# They all use the same machine config, since the u-boot SPL
+# autodetects the machine type upon booting. MACHINEOVERRIDES includes
+# all SoCs from all of these machines to let recipes include firmware
+# etc. for all of these SoCs.
+
+MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:"
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6dl:mx6q"
-
PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
UBOOT_MAKE_TARGET = ""
diff --git a/conf/machine/imx6q-dms-ba16.conf b/conf/machine/imx6q-dms-ba16.conf
index 2b06499..2f837f6 100644
--- a/conf/machine/imx6q-dms-ba16.conf
+++ b/conf/machine/imx6q-dms-ba16.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Advantech DMS BA16 board
#@MAINTAINER: Akshay Bhat <akshay.bhat at timesys.com>
+MACHINEOVERRIDES =. "mx6:mx6q:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6q"
-
UBOOT_MACHINE = "dms-ba16_defconfig"
PREFERRED_PROVIDER_virtual/kernel = "linux-advantech"
diff --git a/conf/machine/imx6qdl-variscite-som.conf b/conf/machine/imx6qdl-variscite-som.conf
index 949f90a..6fa1152 100644
--- a/conf/machine/imx6qdl-variscite-som.conf
+++ b/conf/machine/imx6qdl-variscite-som.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Variscite i.MX6Q/DL VAR-SOM-MX6
#@MAINTAINER: Fabio Berton <fabio.berton at ossystems.com.br>
+MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
+
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6q:mx6dl"
-
PREFERRED_PROVIDER_virtual/kernel = "linux-variscite"
KERNEL_DEVICETREE = "imx6q-var-som.dtb imx6dl-var-som.dtb imx6dl-var-som-solo.dtb"
KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/imx6sl-warp.conf b/conf/machine/imx6sl-warp.conf
index 7b84639..62eeac9 100644
--- a/conf/machine/imx6sl-warp.conf
+++ b/conf/machine/imx6sl-warp.conf
@@ -22,6 +22,8 @@
#correct node that corresponds to the Warp board. Passing an incorrect
#device number may overwrite the host PC file system, causing boot issues there.
+MACHINEOVERRIDES =. "mx6:mx6sl"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
@@ -38,8 +40,6 @@ UBOOT_MACHINE ?= "warp_defconfig"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc-imx"
KERNEL_DEVICETREE = "imx6sl-warp.dtb"
-SOC_FAMILY = "mx6:mx6sl"
-
SERIAL_CONSOLE = "115200 ttymxc0"
MACHINE_FEATURES += "wifi bluetooth serial"
diff --git a/conf/machine/imx6ul-pico-hobbit.conf b/conf/machine/imx6ul-pico-hobbit.conf
index 79898b2..6e0aee3 100644
--- a/conf/machine/imx6ul-pico-hobbit.conf
+++ b/conf/machine/imx6ul-pico-hobbit.conf
@@ -4,6 +4,8 @@
#@DESCRIPTION: Machine configuration for Hobbitboard (PICO-IMX6UL)
#@MAINTAINER: Daiane Angolini <daiane.angolini at nxp.com>
+MACHINEOVERRIDES =. "mx6ul:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
@@ -11,8 +13,6 @@ MACHINE_FEATURES += "wifi bluetooth"
SERIAL_CONSOLE = "115200 ttymxc5"
-SOC_FAMILY = "mx6ul"
-
PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
KERNEL_DEVICETREE = "imx6ul-pico-hobbit.dtb"
diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf
index 6b0b50e..b7b77e2 100644
--- a/conf/machine/imx7s-warp.conf
+++ b/conf/machine/imx7s-warp.conf
@@ -4,6 +4,8 @@
#@DESCRIPTION: Machine configuration for i.MX7S WaRP board.
#@MAINTAINER: Daiane Angolini <daiane.angolini at nxp.com>
+MACHINEOVERRIDES =. "mx7:mx7d:"
+
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa7.inc
@@ -17,8 +19,6 @@ EXTRA_IMAGEDEPENDS += "u-boot"
MACHINE_FEATURES += " wifi bluetooth"
-SOC_FAMILY = "mx7:mx7d"
-
KERNEL_DEVICETREE = "imx7s-warp.dtb"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc-imx"
diff --git a/conf/machine/include/cfa10036.inc b/conf/machine/include/cfa10036.inc
index b83528a..8c79765 100644
--- a/conf/machine/include/cfa10036.inc
+++ b/conf/machine/include/cfa10036.inc
@@ -1,10 +1,10 @@
# Common definitions for cfa-10036 boards
+MACHINEOVERRIDES =. "mxs:mx28:cfa10036:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-arm926ejs.inc
-SOC_FAMILY = "mxs:mx28:cfa10036"
-
PREFERRED_PROVIDER_virtual/kernel ?= "linux-cfa"
PREFERRED_PROVIDER_virtual/bootloader ?= "barebox"
diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc
index f9ff492..e6b9e07 100644
--- a/conf/machine/include/imx233-olinuxino.inc
+++ b/conf/machine/include/imx233-olinuxino.inc
@@ -1,14 +1,14 @@
# Common definitions to all iMX233-OlinuXino variants
+# Add a override for all iMX233-OLinuXino variants
+MACHINEOVERRIDES =. "mxs:mx23:imx233-olinuxino:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-arm926ejs.inc
IMXBOOTLETS_MACHINE = "stmp378x_dev"
UBOOT_MACHINE = "mx23_olinuxino_config"
-# Add a override for all iMX233-OLinuXino variants
-SOC_FAMILY = "mxs:mx23:imx233-olinuxino"
-
KERNEL_IMAGETYPE = "uImage"
KERNEL_DEVICETREE = "imx23-olinuxino.dtb"
diff --git a/conf/machine/m28evk.conf b/conf/machine/m28evk.conf
index 87fc3c7..d5d8986 100644
--- a/conf/machine/m28evk.conf
+++ b/conf/machine/m28evk.conf
@@ -3,11 +3,11 @@
#@SOC: i.MX28
#@DESCRIPTION: Machine configuration for DENX M28 SoM Evaluation Kit
+MACHINEOVERRIDES =. "mxs:mx28:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-arm926ejs.inc
-SOC_FAMILY = "mxs:mx28"
-
UBOOT_MACHINE = "m28evk_config"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
diff --git a/conf/machine/m53evk.conf b/conf/machine/m53evk.conf
index e637e4c..4356d18 100644
--- a/conf/machine/m53evk.conf
+++ b/conf/machine/m53evk.conf
@@ -3,11 +3,11 @@
#@SOC: i.MX53
#@DESCRIPTION: Machine configuration for DENX M53 SoM Evaluation Kit
+MACHINEOVERRIDES =. "mx5:mx53:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa8.inc
-SOC_FAMILY = "mx5:mx53"
-
UBOOT_MACHINE = "m53evk_config"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-denx"
diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 2e71750..43f3a2e 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6SX
#@MAINTAINER: Ian Coolidge <ian at boundarydevices.com>
+MACHINEOVERRIDES =. "mx6:mx6sx:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6sx"
-
KERNEL_DEVICETREE = "imx6sx-nitrogen6sx.dtb"
KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index 0dfde61..c626ed1 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6X Lite
#@MAINTAINER: Ian Coolidge <ian at boundarydevices.com>
+MACHINEOVERRIDES =. "mx6:mx6dl:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6dl"
-
KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index d4547fa..25869cc 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -29,11 +29,11 @@
#
#
+MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6dl:mx6q"
-
KERNEL_DEVICETREE = "imx6q-sabrelite.dtb \
imx6q-nitrogen6_max.dtb imx6qp-nitrogen6_max.dtb \
imx6q-nitrogen6x.dtb imx6dl-nitrogen6x.dtb \
diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index c8eda2b..7ea21b2 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen7
#@MAINTAINER: Ian Coolidge <ian at boundarydevices.com>
+MACHINEOVERRIDES =. "mx7:mx7d:"
+
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa7.inc
-SOC_FAMILY = "mx7:mx7d"
-
KERNEL_DEVICETREE = "imx7d-nitrogen7.dtb"
KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/pcm052.conf b/conf/machine/pcm052.conf
index 2c04799..c1d017a 100644
--- a/conf/machine/pcm052.conf
+++ b/conf/machine/pcm052.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for Phytec phyCORE Vybrid Development Kit
#@MAINTAINER: Anthony Felice <tony.felice at timesys.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-timesys"
PREFERRED_PROVIDER_virtual/kernel-module-mcc ?= "kernel-module-mcc"
PREFERRED_PROVIDER_virtual/kernel-module-mcc-dev ?= "kernel-module-mcc"
diff --git a/conf/machine/tx6q-10x0.conf b/conf/machine/tx6q-10x0.conf
index d02fffb..d2c6544 100644
--- a/conf/machine/tx6q-10x0.conf
+++ b/conf/machine/tx6q-10x0.conf
@@ -4,9 +4,9 @@
#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6Q Computer-On-Module
#@MAINTAINER: Oliver Wendt <ow at karo-electronics.com>
-require include/tx6-karo-common.inc
+MACHINEOVERRIDES =. "mx6:mx6q:"
-SOC_FAMILY = "mx6:mx6q"
+require include/tx6-karo-common.inc
KERNEL_DEVICETREE = "imx6q-tx6q-10x0.dtb"
diff --git a/conf/machine/tx6q-11x0.conf b/conf/machine/tx6q-11x0.conf
index a67c07c..22cb643 100644
--- a/conf/machine/tx6q-11x0.conf
+++ b/conf/machine/tx6q-11x0.conf
@@ -4,9 +4,9 @@
#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6Q Computer-On-Module
#@MAINTAINER: Oliver Wendt <ow at karo-electronics.com>
-require include/tx6-karo-common.inc
+MACHINEOVERRIDES =. "mx6:mx6q:"
-SOC_FAMILY = "mx6:mx6q"
+require include/tx6-karo-common.inc
KERNEL_DEVICETREE = "imx6q-tx6q-11x0.dtb"
diff --git a/conf/machine/tx6s-8034.conf b/conf/machine/tx6s-8034.conf
index 90fce6f..c1d014c 100644
--- a/conf/machine/tx6s-8034.conf
+++ b/conf/machine/tx6s-8034.conf
@@ -4,9 +4,9 @@
#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6S Computer-On-Module
#@MAINTAINER: Oliver Wendt <ow at karo-electronics.com>
-require include/tx6-karo-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
-SOC_FAMILY = "mx6:mx6dl"
+require include/tx6-karo-common.inc
KERNEL_DEVICETREE = "imx6dl-tx6s-8034.dtb"
diff --git a/conf/machine/tx6s-8035.conf b/conf/machine/tx6s-8035.conf
index 55acc35..41465f2 100644
--- a/conf/machine/tx6s-8035.conf
+++ b/conf/machine/tx6s-8035.conf
@@ -4,9 +4,9 @@
#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6S Computer-On-Module
#@MAINTAINER: Oliver Wendt <ow at karo-electronics.com>
-require include/tx6-karo-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
-SOC_FAMILY = "mx6:mx6dl"
+require include/tx6-karo-common.inc
KERNEL_DEVICETREE = "imx6dl-tx6s-8035.dtb"
diff --git a/conf/machine/tx6u-8033.conf b/conf/machine/tx6u-8033.conf
index d8c46d5..b3fcca2 100644
--- a/conf/machine/tx6u-8033.conf
+++ b/conf/machine/tx6u-8033.conf
@@ -4,9 +4,9 @@
#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6DL Computer-On-Module
#@MAINTAINER: Oliver Wendt <ow at karo-electronics.com>
-require include/tx6-karo-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
-SOC_FAMILY = "mx6:mx6dl"
+require include/tx6-karo-common.inc
KERNEL_DEVICETREE = "imx6dl-tx6u-8033.dtb"
diff --git a/conf/machine/tx6u-80x0.conf b/conf/machine/tx6u-80x0.conf
index d743c5c..c945063 100644
--- a/conf/machine/tx6u-80x0.conf
+++ b/conf/machine/tx6u-80x0.conf
@@ -4,9 +4,9 @@
#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6DL Computer-On-Module
#@MAINTAINER: Oliver Wendt <ow at karo-electronics.com>
-require include/tx6-karo-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
-SOC_FAMILY = "mx6:mx6dl"
+require include/tx6-karo-common.inc
KERNEL_DEVICETREE = "imx6dl-tx6u-80xx.dtb"
diff --git a/conf/machine/tx6u-81x0.conf b/conf/machine/tx6u-81x0.conf
index 19a97a5..6951abe 100644
--- a/conf/machine/tx6u-81x0.conf
+++ b/conf/machine/tx6u-81x0.conf
@@ -4,9 +4,9 @@
#@DESCRIPTION: Machine configuration for Ka-Ro electronics TX6DL Computer-On-Module
#@MAINTAINER: Oliver Wendt <ow at karo-electronics.com>
-require include/tx6-karo-common.inc
+MACHINEOVERRIDES =. "mx6:mx6dl:"
-SOC_FAMILY = "mx6:mx6dl"
+require include/tx6-karo-common.inc
KERNEL_DEVICETREE = "imx6dl-tx6u-81xx.dtb"
diff --git a/conf/machine/ventana.conf b/conf/machine/ventana.conf
index 1974100..b67ec1e 100644
--- a/conf/machine/ventana.conf
+++ b/conf/machine/ventana.conf
@@ -4,6 +4,8 @@
#@DESCRIPTION: Machine configuration for Gateworks Ventana boards.
#@MAINTAINER: Pushpal Sidhu <psidhu at gateworks.com>
+MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:"
+
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa9.inc
@@ -13,8 +15,6 @@ PREFERRED_PROVIDER_u-boot = "u-boot-gateworks-imx"
PREFERRED_PROVIDER_virtual/kernel = "linux-gateworks-imx"
PREFERRED_PROVIDER_kernel = "linux-gateworks-imx"
-SOC_FAMILY = "mx6:mx6dl:mx6q"
-
KERNEL_DEVICETREE = " \
imx6q-gw5400-a.dtb \
imx6q-gw51xx.dtb \
diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf
index ba1f8cd..0289f18 100644
--- a/conf/machine/wandboard.conf
+++ b/conf/machine/wandboard.conf
@@ -4,11 +4,11 @@
#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
#@MAINTAINER: Alfonso Tames <alfonso at tames.com>
+MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:"
+
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6:mx6dl:mx6q"
-
UBOOT_MAKE_TARGET = ""
UBOOT_SUFFIX = "img"
SPL_BINARY = "SPL"
--
2.9.3
More information about the meta-freescale
mailing list