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>

diff --git a/meta-fsl-arm/conf/machine/imx23evk.conf b/meta-fsl-arm/conf/machine/imx23evk.conf
index a5c0f98948f56b265c19f94660fee2385ce174f2..80a771fa490db0753dd05bfea9376b6716df84a7 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx23evk.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx28evk.conf b/meta-fsl-arm/conf/machine/imx28evk.conf
index df00203f242b5f5febd868adee34a71018292cc2..d80e9d96c5ff8bdc0da4f049827b4997da04eced 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx28evk.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx31pdk.conf b/meta-fsl-arm/conf/machine/imx31pdk.conf
index 9b6da314f5f0e6b67f6c15c6c388acb31796e72b..3aa660675ab7c332679d50713476bcec5f9c7efb 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx31pdk.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx35pdk.conf b/meta-fsl-arm/conf/machine/imx35pdk.conf
index 62e69302e9ee6b5a56abb361d9c1dc1a64b3b75d..2d48699404383c9690eec7ae2da1d0f92daebafe 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx35pdk.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx51evk.conf b/meta-fsl-arm/conf/machine/imx51evk.conf
index 2e27ed7786d4279bc1fac9ffe7b4e56c8bd12f2f..8ac38f0a1e14367ddb236e0b8a39046bfb39778d 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx51evk.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf
index 4f15493ec5a714fe479fb90d98166fff06a050d0..20898c479e6324444465a082cd62a88a4c602a1f 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx53ard.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf
index 9aec913da619b5d37be134fa1c456c7e6b8a2a0d..1a95a71101a4918538b86f28547dfa713e1cfc18 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx53qsb.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx6dlsabresd.conf b/meta-fsl-arm/conf/machine/imx6dlsabresd.conf
index 215ec1bc6a472af94efa8beacb3771bd6d374e32..99c9b85b08f4387de9259931fa57f5eb8e23ad3e 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6dlsabresd.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx6qsabreauto.conf b/meta-fsl-arm/conf/machine/imx6qsabreauto.conf
index 6f0bd8c8be2b492d8106824b5c1b602197f32ddc..8ebd1565cb2c0b121027101eadde00d01ad693d9 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx6qsabresd.conf b/meta-fsl-arm/conf/machine/imx6qsabresd.conf
index d5a5192dadbf82d23110446e5314b3017f5bfbf0..67bdc65f2581e98e8daa2a28faa834a4e6fe8627 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6qsabresd.conf
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/imx6slevk.conf b/meta-fsl-arm/conf/machine/imx6slevk.conf
index 454c34f7f5ededa7bb9326adb2ad5a446f2d7016..78bc24b15f431fa2a25aec5b547a1c9b49c8e21f 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6slevk.conf
+++ b/meta-fsl-arm/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"