Patchwork [for-danny] soc-family: fix SOC_FAMILY override order

login
register
mail settings
Submitter Denys Dmytriyenko
Date March 12, 2013, 8:22 p.m.
Message ID <1363119725-5341-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/46089/
State New
Headers show

Comments

Denys Dmytriyenko - March 12, 2013, 8:22 p.m.
From: Chase Maupin <Chase.Maupin@ti.com>

* 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>
---
 meta/conf/machine/include/soc-family.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - March 12, 2013, 8:27 p.m.
On 12 March 2013 13:22, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Chase Maupin <Chase.Maupin@ti.com>
>
> * 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.

Merged to danny-next locally, will be pushed later.

Ross

Patch

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