aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-04-11 10:06:55 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-04-17 18:20:22 -0300
commit74af82332fcec03f19f278024ad131c7c6eb3f53 (patch)
tree93e14278c4c38cd7f984dc5097956d5fe48409a7
parent6c2aaf765191194db83440c79c112d594648ecbf (diff)
downloadmeta-fsl-arm-74af82332fcec03f19f278024ad131c7c6eb3f53.tar.gz
meta-fsl-arm-74af82332fcec03f19f278024ad131c7c6eb3f53.tar.bz2
meta-fsl-arm-74af82332fcec03f19f278024ad131c7c6eb3f53.zip
Fix use of SOC_FAMILY as the most right value is preferred
The SOC_FAMILY uses the MACHINEOVERRIDES and it evaluates from left to right. In this case, the most SoC specific value needs to be kept in the right so it take precedence. This has been catch when finding out why i.MX6SL EVK where using the wrong value as entry point, and this was the root cause. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/imx23evk.conf2
-rw-r--r--conf/machine/imx28evk.conf2
-rw-r--r--conf/machine/imx31pdk.conf2
-rw-r--r--conf/machine/imx35pdk.conf2
-rw-r--r--conf/machine/imx51evk.conf2
-rw-r--r--conf/machine/imx53ard.conf2
-rw-r--r--conf/machine/imx53qsb.conf2
-rw-r--r--conf/machine/imx6dlsabresd.conf2
-rw-r--r--conf/machine/imx6qsabreauto.conf2
-rw-r--r--conf/machine/imx6qsabresd.conf2
-rw-r--r--conf/machine/imx6slevk.conf2
11 files changed, 11 insertions, 11 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index a5c0f98..80a771f 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -4,7 +4,7 @@
include conf/machine/include/mxs-base.inc
-SOC_FAMILY = "mx23:mxs"
+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 df00203..d80e9d9 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -4,7 +4,7 @@
include conf/machine/include/mxs-base.inc
-SOC_FAMILY = "mx28:mxs"
+SOC_FAMILY = "mxs:mx28"
IMXBOOTLETS_MACHINE = "iMX28_EVK"
UBOOT_MACHINE = "mx28evk_config"
diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf
index 9b6da31..3aa6606 100644
--- a/conf/machine/imx31pdk.conf
+++ b/conf/machine/imx31pdk.conf
@@ -6,7 +6,7 @@ include conf/machine/include/soc-family.inc
include conf/machine/include/imx-base.inc
require conf/machine/include/tune-arm1136jf-s.inc
-SOC_FAMILY = "mx31:mx3"
+SOC_FAMILY = "mx3:mx31"
GUI_MACHINE_CLASS = "smallscreen"
diff --git a/conf/machine/imx35pdk.conf b/conf/machine/imx35pdk.conf
index 62e6930..2d48699 100644
--- a/conf/machine/imx35pdk.conf
+++ b/conf/machine/imx35pdk.conf
@@ -6,7 +6,7 @@ include conf/machine/include/soc-family.inc
include conf/machine/include/imx-base.inc
require conf/machine/include/tune-arm1136jf-s.inc
-SOC_FAMILY = "mx35:mx3"
+SOC_FAMILY = "mx3:mx35"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 2e27ed7..8ac38f0 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa8.inc
-SOC_FAMILY = "mx51:mx5"
+SOC_FAMILY = "mx5:mx51"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx51-babbage.dts"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index 4f15493..20898c4 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa8.inc
-SOC_FAMILY = "mx53:mx5"
+SOC_FAMILY = "mx5:mx53"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts"
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 9aec913..1a95a71 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa8.inc
-SOC_FAMILY = "mx53:mx5"
+SOC_FAMILY = "mx5:mx53"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index 215ec1b..99c9b85 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6dl:mx6"
+SOC_FAMILY = "mx6:mx6dl"
PREFERRED_PROVIDER_u-boot = "u-boot-imx"
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index 6f0bd8c..8ebd156 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6q:mx6"
+SOC_FAMILY = "mx6:mx6q"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabreauto.dts"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index d5a5192..67bdc65 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6q:mx6"
+SOC_FAMILY = "mx6:mx6q"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 454c34f..78bc24b 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
-SOC_FAMILY = "mx6sl:mx6"
+SOC_FAMILY = "mx6:mx6sl"
UBOOT_MACHINE = "mx6slevk_config"