Patchwork [meta-fsl-arm,v4,09/12] Fix use of SOC_FAMILY as the most right value is preferred

login
register
mail settings
Submitter Otavio Salvador
Date April 15, 2013, 8:15 p.m.
Message ID <1366056962-13233-10-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/48285/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - April 15, 2013, 8:15 p.m.
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>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None

 conf/machine/imx23evk.conf       | 2 +-
 conf/machine/imx28evk.conf       | 2 +-
 conf/machine/imx31pdk.conf       | 2 +-
 conf/machine/imx35pdk.conf       | 2 +-
 conf/machine/imx51evk.conf       | 2 +-
 conf/machine/imx53ard.conf       | 2 +-
 conf/machine/imx53qsb.conf       | 2 +-
 conf/machine/imx6dlsabresd.conf  | 2 +-
 conf/machine/imx6qsabreauto.conf | 2 +-
 conf/machine/imx6qsabresd.conf   | 2 +-
 conf/machine/imx6slevk.conf      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

Patch

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"