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.

Change-Id: I34ae0076690716ba71fd80311a1e427821e4e762
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador 2013-04-11 10:17:19 -03:00
parent 34fa2e642b
commit 5f5a9cfcad
6 changed files with 6 additions and 6 deletions

View File

@ -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"
# Use u-boot imx
UBOOT_SUFFIX = "bin"

View File

@ -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-sabrelite.dts"

View File

@ -6,7 +6,7 @@ IMXBOOTLETS_MACHINE = "stmp378x_dev"
UBOOT_MACHINE = "mx23_olinuxino_config"
# Add a override for all iMX233-OLinuXino variants
SOC_FAMILY = "imx233-olinuxino:mx23:mxs"
SOC_FAMILY = "mxs:mx23:imx233-olinuxino"
KERNEL_IMAGETYPE = "uImage"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"

View File

@ -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"
PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
PREFERRED_PROVIDER_virtual/kernel = "linux-boundary"

View File

@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
SOC_FAMILY = "wandboard:mx6dl:mx6"
SOC_FAMILY = "mx6:mx6dl:wandboard"
PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"

View File

@ -5,7 +5,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
SOC_FAMILY = "wandboard:mx6s:mx6"
SOC_FAMILY = "mx6:mx6s:wandboard"
PREFERRED_PROVIDER_virtual/kernel = "linux-wandboard"