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 <[email protected]> --- Changes in v2: - Fix wandboard-solo SOC_FAMILY conf/machine/cgtqmx6.conf | 2 +- conf/machine/imx6qsabrelite.conf | 2 +- conf/machine/include/imx233-olinuxino.inc | 2 +- conf/machine/nitrogen6x.conf | 2 +- conf/machine/wandboard-dual.conf | 2 +- conf/machine/wandboard-solo.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf index 34e3a74..5c369c5 100644 --- a/conf/machine/cgtqmx6.conf +++ b/conf/machine/cgtqmx6.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" # Use u-boot imx UBOOT_SUFFIX = "bin" diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf index 46abdd3..b79ae62 100644 --- a/conf/machine/imx6qsabrelite.conf +++ b/conf/machine/imx6qsabrelite.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-sabrelite.dts" diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc index 62a6e8b..9c4e9d9 100644 --- a/conf/machine/include/imx233-olinuxino.inc +++ b/conf/machine/include/imx233-olinuxino.inc @@ -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" diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf index dc61b63..bec0844 100644 --- a/conf/machine/nitrogen6x.conf +++ b/conf/machine/nitrogen6x.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" PREFERRED_PROVIDER_u-boot = "u-boot-boundary" PREFERRED_PROVIDER_virtual/kernel = "linux-boundary" diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf index ce249e7..6339ac4 100644 --- a/conf/machine/wandboard-dual.conf +++ b/conf/machine/wandboard-dual.conf @@ -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" diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf index 32bbe4e..7c54cb9 100644 --- a/conf/machine/wandboard-solo.conf +++ b/conf/machine/wandboard-solo.conf @@ -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" -- 1.8.1 _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
