]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
soc-family: fix SOC_FAMILY override order
authorChase Maupin <Chase.Maupin@ti.com>
Fri, 8 Mar 2013 17:51:04 +0000 (11:51 -0600)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 10 Mar 2013 04:36:50 +0000 (04:36 +0000)
* the current order has SOC_FAMILY settings, which are generic
  settings for a group of devices, overriding the machine specific
  settings.  For example:

  KERNEL_DEVICETREE_ti33x = "xxxx"
  KERNEL_DEVICETREE_beaglebone = "yyyy"

  Should yield "yyyy" when building for the beaglebone because
  that is a more specific device than ti33x.  However, without this
  change the result is that the value is set to "xxxx" meaning the
  more generic setting overrides the more specific setting.

(From OE-Core rev: 0b836b9d79255a5b2f358fe718c67638f52ecf72)

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/conf/machine/include/soc-family.inc

index 612039cb8279b94234f5df306c6f7505789a6b9d..0251da079cb17a631349f0e123f942ebac0e00df 100644 (file)
@@ -1,2 +1,2 @@
 # Add SOC_FAMILY to machine overrides so we get access to e.g. 'omap3' and 'ti335x'
-MACHINEOVERRIDES .= "${@['', ':${SOC_FAMILY}']['${SOC_FAMILY}' != '']}"
+MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}:']['${SOC_FAMILY}' != '']}"