From 7bf1dfa3cd95c023f0df2a177ec48be2432f285c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 11 Apr 2013 10:06:55 -0300 Subject: [PATCH] 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 --- meta-fsl-arm/conf/machine/imx23evk.conf | 2 +- meta-fsl-arm/conf/machine/imx28evk.conf | 2 +- meta-fsl-arm/conf/machine/imx31pdk.conf | 2 +- meta-fsl-arm/conf/machine/imx35pdk.conf | 2 +- meta-fsl-arm/conf/machine/imx51evk.conf | 2 +- meta-fsl-arm/conf/machine/imx53ard.conf | 2 +- meta-fsl-arm/conf/machine/imx53qsb.conf | 2 +- meta-fsl-arm/conf/machine/imx6dlsabresd.conf | 2 +- meta-fsl-arm/conf/machine/imx6qsabreauto.conf | 2 +- meta-fsl-arm/conf/machine/imx6qsabresd.conf | 2 +- meta-fsl-arm/conf/machine/imx6slevk.conf | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-fsl-arm/conf/machine/imx23evk.conf b/meta-fsl-arm/conf/machine/imx23evk.conf index a5c0f989..80a771fa 100644 --- 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 df00203f..d80e9d96 100644 --- 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 9b6da314..3aa66067 100644 --- 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 62e69302..2d486994 100644 --- 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 2e27ed77..8ac38f0a 100644 --- 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 4f15493e..20898c47 100644 --- 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 9aec913d..1a95a711 100644 --- 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 215ec1bc..99c9b85b 100644 --- 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 6f0bd8c8..8ebd1565 100644 --- 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 d5a5192d..67bdc65f 100644 --- 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 454c34f7..78bc24b1 100644 --- 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" -- 2.40.1