diff options
| author | Chase Maupin <Chase.Maupin@ti.com> | 2013-03-08 11:51:04 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-10 04:36:50 +0000 |
| commit | 5ecdb3edba8238661815ca5d90b05215f06f4249 (patch) | |
| tree | 30c37a1ed4e7f410a598b5e0e754f7f88e0784ac /meta/conf | |
| parent | 0c02924f6342ad3d977efdbba903a85b4947d5b0 (diff) | |
| download | poky-5ecdb3edba8238661815ca5d90b05215f06f4249.tar.gz | |
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>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/soc-family.inc | 2 |
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 @@ | |||
| 1 | # Add SOC_FAMILY to machine overrides so we get access to e.g. 'omap3' and 'ti335x' | 1 | # Add SOC_FAMILY to machine overrides so we get access to e.g. 'omap3' and 'ti335x' |
| 2 | MACHINEOVERRIDES .= "${@['', ':${SOC_FAMILY}']['${SOC_FAMILY}' != '']}" | 2 | MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}:']['${SOC_FAMILY}' != '']}" |