diff options
authorOtavio Salvador <otavio@ossystems.com.br>2013-11-12 16:13:57 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2013-11-13 15:46:30 -0200
commit3f2f08fe88a1a5da2d726402b77381c7311f8e74 (patch)
parent31aef9be2ecc590fd41d959f99533d120a288926 (diff)
fsl-default-providers.inc: Make virtual/kernel assigment delayed
In 01851da (machine/*: Allow kernel provider override) the assigment of preferred provider for virtual/kernel has been changed to a weak assignment. This works for most of cases but has caused a regression in some machines. When a machine includes the imx-base.inc file, the assignment is done and the intended setting of the machine does not take effect. For example, in the below code fragment: ,----[ Wandboard board configuration fragment ] | include conf/machine/include/imx-base.inc | ... | PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard" `---- the virtual/kernel provider would be 'linux-imx' as, at the time of imx-base.inc inclusion, it was undefined. The expected behaviour would be to use 'linux-imx' /only/ when no setting has been done. The ??= operator solves this as it is used /only/ if no assignment is done to the virtual/kernel provider in the end of the parsing. So it gives the expected behaviour. Change-Id: Iab73dcff8bef7f2df1064a0d5d04fd506a4c3144 Reported-by: Alfonso Tam├ęs <alfonso@mantic.mx> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc
index e51ea72..da01871 100644
--- a/conf/machine/include/fsl-default-providers.inc
+++ b/conf/machine/include/fsl-default-providers.inc
@@ -1,6 +1,6 @@
# Freescale BSP default providers
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-imx"
PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-fslc"