summaryrefslogtreecommitdiffstats
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:00:02 -0300
commit90c00bba1ce3d3df78138c146323c7244099aa26 (patch)
tree9d7aad6f01e7958147c7270dbff4b01401341d54
parent0bd6831d1122581ea619314da2cd68830564a64e (diff)
downloadmeta-fsl-arm-90c00bba1ce3d3df78138c146323c7244099aa26.tar.gz
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>
-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/include/qoriq-arm.inc2
-rw-r--r--conf/machine/ls1021atwr.conf4
-rw-r--r--conf/machine/twr-vf65gs10.conf4
-rw-r--r--qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc2
23 files changed, 41 insertions, 45 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 6ec1f14..6c4daa5 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX23 Evaluation Kit 4#@DESCRIPTION: Machine configuration for Freescale i.MX23 Evaluation Kit
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> 5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6 6
7MACHINEOVERRIDES =. "mxs:mx23:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-arm926ejs.inc 10include conf/machine/include/tune-arm926ejs.inc
9 11
10SOC_FAMILY = "mxs:mx23"
11
12IMXBOOTLETS_MACHINE = "stmp378x_dev" 12IMXBOOTLETS_MACHINE = "stmp378x_dev"
13UBOOT_MACHINE = "mx23evk_config" 13UBOOT_MACHINE = "mx23evk_config"
14 14
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index ac4cef5..5bdbcad 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit 4#@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> 5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6 6
7MACHINEOVERRIDES =. "mxs:mx28:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-arm926ejs.inc 10include conf/machine/include/tune-arm926ejs.inc
9 11
10SOC_FAMILY = "mxs:mx28"
11
12IMXBOOTLETS_MACHINE = "iMX28_EVK" 12IMXBOOTLETS_MACHINE = "iMX28_EVK"
13 13
14UBOOT_CONFIG ??= "sd" 14UBOOT_CONFIG ??= "sd"
diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 9d7d06c..e6904f9 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit 4#@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit
5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com> 5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
6 6
7MACHINEOVERRIDES =. "mx5:mx51:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-cortexa8.inc 10include conf/machine/include/tune-cortexa8.inc
9 11
10SOC_FAMILY = "mx5:mx51"
11
12# Disable perf features as 2.6.35.3 fails to build otherwise 12# Disable perf features as 2.6.35.3 fails to build otherwise
13PERF_FEATURES_ENABLE = "" 13PERF_FEATURES_ENABLE = ""
14 14
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index c338d6b..f416c95 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive Board 4#@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive Board
5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com> 5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
6 6
7MACHINEOVERRIDES =. "mx5:mx53:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-cortexa8.inc 10include conf/machine/include/tune-cortexa8.inc
9 11
10SOC_FAMILY = "mx5:mx53"
11
12# Disable perf features as 2.6.35.3 fails to build otherwise 12# Disable perf features as 2.6.35.3 fails to build otherwise
13PERF_FEATURES_ENABLE = "" 13PERF_FEATURES_ENABLE = ""
14 14
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 5df85a9..dc264c4 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board 4#@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board
5#@MAINTAINER: Trevor Woerner <trevor.woerner@linaro.org> 5#@MAINTAINER: Trevor Woerner <trevor.woerner@linaro.org>
6 6
7MACHINEOVERRIDES =. "mx5:mx53:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-cortexa8.inc 10include conf/machine/include/tune-cortexa8.inc
9 11
10SOC_FAMILY = "mx5:mx53"
11
12KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" 12KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
13 13
14UBOOT_MACHINE = "mx53loco_config" 14UBOOT_MACHINE = "mx53loco_config"
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index a9bdfe5..3df479b 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive 4#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive
5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com> 5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
6 6
7require conf/machine/include/imx6sabreauto-common.inc 7MACHINEOVERRIDES =. "mx6:mx6dl:"
8 8
9SOC_FAMILY = "mx6:mx6dl" 9require conf/machine/include/imx6sabreauto-common.inc
10 10
11KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \ 11KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
12 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb" 12 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb"
diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index f832666..9943246 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device 4#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> 5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6 6
7require conf/machine/include/imx6sabresd-common.inc 7MACHINEOVERRIDES =. "mx6:mx6dl:"
8 8
9SOC_FAMILY = "mx6:mx6dl" 9require conf/machine/include/imx6sabresd-common.inc
10 10
11KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \ 11KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
12 imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb" 12 imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb"
diff --git a/conf/machine/imx6qpsabreauto.conf b/conf/machine/imx6qpsabreauto.conf
index b227338..f8e914a 100644
--- a/conf/machine/imx6qpsabreauto.conf
+++ b/conf/machine/imx6qpsabreauto.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Automotive 4#@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Automotive
5#@MAINTAINER: Lauren Post <lauren.post@nxp.com> 5#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
6 6
7require conf/machine/include/imx6sabreauto-common.inc 7MACHINEOVERRIDES =. "mx6:mx6q:"
8 8
9SOC_FAMILY = "mx6:mx6q" 9require conf/machine/include/imx6sabreauto-common.inc
10 10
11KERNEL_DEVICETREE = "imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \ 11KERNEL_DEVICETREE = "imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \
12 imx6qp-sabreauto-gpmi-weim.dtb" 12 imx6qp-sabreauto-gpmi-weim.dtb"
diff --git a/conf/machine/imx6qpsabresd.conf b/conf/machine/imx6qpsabresd.conf
index 2e7ee47..123a435 100644
--- a/conf/machine/imx6qpsabresd.conf
+++ b/conf/machine/imx6qpsabresd.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Smart Device 4#@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Smart Device
5#@MAINTAINER: Lauren Post <lauren.post@nxp.com> 5#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
6 6
7require conf/machine/include/imx6sabresd-common.inc 7MACHINEOVERRIDES =. "mx6:mx6q:"
8 8
9SOC_FAMILY = "mx6:mx6q" 9require conf/machine/include/imx6sabresd-common.inc
10 10
11KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-ldo.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb" 11KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-ldo.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb"
12 12
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index 3429551..e25a733 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive 4#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive
5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com> 5#@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
6 6
7require conf/machine/include/imx6sabreauto-common.inc 7MACHINEOVERRIDES =. "mx6:mx6q:"
8 8
9SOC_FAMILY = "mx6:mx6q" 9require conf/machine/include/imx6sabreauto-common.inc
10 10
11KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \ 11KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \
12 imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb" 12 imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index 8115dfa..33fff89 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device 4#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> 5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6 6
7require conf/machine/include/imx6sabresd-common.inc 7MACHINEOVERRIDES =. "mx6:mx6q:"
8 8
9SOC_FAMILY = "mx6:mx6q" 9require conf/machine/include/imx6sabresd-common.inc
10 10
11KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \ 11KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
12 imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb" 12 imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 98402f7..02cb8f0 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6SL Evaluation Kit 4#@DESCRIPTION: Machine configuration for Freescale i.MX6SL Evaluation Kit
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> 5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6 6
7MACHINEOVERRIDES =. "mx6:mx6sl:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-cortexa9.inc 10include conf/machine/include/tune-cortexa9.inc
9 11
10SOC_FAMILY = "mx6:mx6sl"
11
12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \ 12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
13 imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb" 13 imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb"
14 14
diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index ead787d..3ced78d 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/conf/machine/imx6solosabreauto.conf
@@ -3,9 +3,9 @@
3#@SOC: i.MX6S 3#@SOC: i.MX6S
4#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive 4#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive
5 5
6require conf/machine/include/imx6sabresd-common.inc 6MACHINEOVERRIDES =. "mx6:mx6dl:"
7 7
8SOC_FAMILY = "mx6:mx6dl" 8require conf/machine/include/imx6sabresd-common.inc
9 9
10KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" 10KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
11 11
diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index b123d8c..24fa649 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/conf/machine/imx6solosabresd.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Smart Device 4#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Smart Device
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br> 5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6 6
7require conf/machine/include/imx6sabresd-common.inc 7MACHINEOVERRIDES =. "mx6:mx6dl:"
8 8
9SOC_FAMILY = "mx6:mx6dl" 9require conf/machine/include/imx6sabresd-common.inc
10 10
11KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb" 11KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
12 12
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 9c8a01f..4f399a3 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre Automotive 4#@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre Automotive
5#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> 5#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
6 6
7require conf/machine/include/imx6sabreauto-common.inc 7MACHINEOVERRIDES =. "mx6:mx6sx:"
8 8
9SOC_FAMILY = "mx6:mx6sx" 9require conf/machine/include/imx6sabreauto-common.inc
10 10
11KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb" 11KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
12 12
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 2243d1f..857b735 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -4,9 +4,9 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre SD 4#@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre SD
5#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> 5#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
6 6
7require conf/machine/include/imx6sabresd-common.inc 7MACHINEOVERRIDES =. "mx6:mx6sx:"
8 8
9SOC_FAMILY = "mx6:mx6sx" 9require conf/machine/include/imx6sabresd-common.inc
10 10
11KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \ 11KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
12 imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \ 12 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 8e2fef0..7ab0963 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -4,13 +4,13 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX6UL EVK 4#@DESCRIPTION: Machine configuration for Freescale i.MX6UL EVK
5#@MAINTAINER: Lauren Post <lauren.post@nxp.com> 5#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
6 6
7MACHINEOVERRIDES =. "mx6ul:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-cortexa7.inc 10include conf/machine/include/tune-cortexa7.inc
9 11
10MACHINE_FEATURES += " pci wifi bluetooth" 12MACHINE_FEATURES += " pci wifi bluetooth"
11 13
12SOC_FAMILY = "mx6ul"
13
14KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb" 14KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb"
15 15
16UBOOT_SUFFIX = "img" 16UBOOT_SUFFIX = "img"
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 673207f..5d74997 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -4,13 +4,13 @@
4#@DESCRIPTION: Machine configuration for Freescale i.MX7D SABRE Smart Device 4#@DESCRIPTION: Machine configuration for Freescale i.MX7D SABRE Smart Device
5#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> 5#@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
6 6
7MACHINEOVERRIDES =. "mx7:mx7d:"
8
7require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
8require conf/machine/include/tune-cortexa7.inc 10require conf/machine/include/tune-cortexa7.inc
9 11
10MACHINE_FEATURES += " pci wifi bluetooth" 12MACHINE_FEATURES += " pci wifi bluetooth"
11 13
12SOC_FAMILY = "mx7:mx7d"
13
14KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \ 14KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
15 imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \ 15 imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \
16 imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \ 16 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 1d7993c..a6db038 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -3,8 +3,6 @@
3include conf/machine/include/fsl-default-settings.inc 3include conf/machine/include/fsl-default-settings.inc
4include conf/machine/include/fsl-default-versions.inc 4include conf/machine/include/fsl-default-versions.inc
5 5
6include conf/machine/include/soc-family.inc
7
8# Set specific make target and binary suffix 6# Set specific make target and binary suffix
9PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc" 7PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
10PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc" 8PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index 20a7594..2ae1963 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,5 +1,3 @@
1require conf/machine/include/soc-family.inc
2
3# Freescale BSP default providers 1# Freescale BSP default providers
4PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-ls1" 2PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-ls1"
5PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-ls1" 3PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-ls1"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 4478e95..2cf5916 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode 4#@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode
5#@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com> 5#@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
6 6
7MACHINEOVERRIDES =. "ls102xa:"
8
7require conf/machine/include/qoriq-arm.inc 9require conf/machine/include/qoriq-arm.inc
8require conf/machine/include/tune-cortexa7.inc 10require conf/machine/include/tune-cortexa7.inc
9 11
10SOC_FAMILY = "ls102xa"
11
12UBOOT_CONFIG ??= "nor" 12UBOOT_CONFIG ??= "nor"
13UBOOT_CONFIG[nor] = "ls1021atwr_nor_config" 13UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
14UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard" 14UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index dd5a21a..c14ee5b 100644
--- a/conf/machine/twr-vf65gs10.conf
+++ b/conf/machine/twr-vf65gs10.conf
@@ -4,11 +4,11 @@
4#@DESCRIPTION: Machine configuration for Freescale Vybrid TWR-VF65GS10 4#@DESCRIPTION: Machine configuration for Freescale Vybrid TWR-VF65GS10
5#@MAINTAINER: Stefan Agner <stefan.agner@toradex.com> 5#@MAINTAINER: Stefan Agner <stefan.agner@toradex.com>
6 6
7MACHINEOVERRIDES =. "vf:vf60:"
8
7include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
8include conf/machine/include/tune-cortexa5.inc 10include conf/machine/include/tune-cortexa5.inc
9 11
10SOC_FAMILY = "vf:vf60"
11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc" 12PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
13 13
14UBOOT_MACHINE = "vf610twr_config" 14UBOOT_MACHINE = "vf610twr_config"
diff --git a/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index 0efb564..5c4a39c 100644
--- a/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
2 2
3python __anonymous () { 3python __anonymous () {
4 families = ['mx6'] 4 families = ['mx6']
5 cur_families = (d.getVar('SOC_FAMILY', True) or '').split(':') 5 cur_families = (d.getVar('MACHINEOVERRIDES', True) or '').split(':')
6 if any(map(lambda x: x in cur_families, 6 if any(map(lambda x: x in cur_families,
7 families)): 7 families)):
8 d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir') 8 d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir')