From: Chase Maupin <Chase.Maupin@ti.com>
Date: Fri, 8 Mar 2013 17:51:04 +0000 (-0600)
Subject: soc-family: fix SOC_FAMILY override order
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ecdb3edba8238661815ca5d90b05215f06f4249;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

soc-family: fix SOC_FAMILY override order

* 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>
---

diff --git a/meta/conf/machine/include/soc-family.inc b/meta/conf/machine/include/soc-family.inc
index 612039cb827..0251da079cb 100644
--- a/meta/conf/machine/include/soc-family.inc
+++ b/meta/conf/machine/include/soc-family.inc
@@ -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}' != '']}"