soc-family: fix SOC_FAMILY override order
PATCH 1/1 soc-family: fix SOC_FAMILY override order
From: Chase Maupin <[email protected]>
* 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.
--- meta/conf/machine/include/soc-family.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/machine/include/soc-family.inc +1 -1
@@ -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}' != '']}"
Signature · 1 line
1.8.1.5
Quoted 6 lines · Denys Dmytriyenko
From: Chase Maupin <[email protected]>
* the current order has
SOC_FAMILYsettings, which are generic settings for a group of devices, overriding the machine specific settings. For example:
Quoted 7 lines
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