summaryrefslogtreecommitdiff
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorChase Maupin <Chase.Maupin@ti.com>2013-03-08 11:51:04 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-09 06:10:16 +0000
commit0b836b9d79255a5b2f358fe718c67638f52ecf72 (patch)
tree9342c08a07c7ab9dc0390e8fb2ad14f7ace30e2a /meta/conf/machine
parent05182ee354a9f773c8ab2f4cd7f1fdf552e7fcda (diff)
downloadopenembedded-core-0b836b9d79255a5b2f358fe718c67638f52ecf72.tar.gz
openembedded-core-0b836b9d79255a5b2f358fe718c67638f52ecf72.tar.bz2
openembedded-core-0b836b9d79255a5b2f358fe718c67638f52ecf72.zip
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. Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/soc-family.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/include/soc-family.inc b/meta/conf/machine/include/soc-family.inc
index 612039cb82..0251da079c 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}' != '']}"