[meta-freescale] [meta-fsl-arm][PATCH 2/3] colibri-imx6.conf: change some assignments to soft default

[Brandon Shibley]

Changed some machine variable assignments in colibri-imx6.conf
from hard assignments to soft defaults so they may be overridden
by user configuration (e.g. conf/local.conf).

Signed-off-by: Brandon Shibley <brandon.shibley at toradex.com>
---
 conf/machine/colibri-imx6.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 64987a6..4342f0f 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -9,14 +9,14 @@ include conf/machine/include/tune-cortexa9.inc

 SOC_FAMILY = "mx6:mx6dl"

-PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-KERNEL_DEVICETREE = "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
+KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb"
 KERNEL_IMAGETYPE = "uImage"

-PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
-UBOOT_MACHINE = "colibri_imx6_defconfig"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
+UBOOT_MACHINE ?= "colibri_imx6_defconfig"

-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLE ?= "115200 ttymxc0"

 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
--
1.9.1


[https://docs.toradex.com/102179-toradex-logo-for-us-email-signature.png]<http://toradex.com>   Global Leader in ARM™
Embedded Computer Modules

Products<http://www.toradex.com/products/compare-products> | Developer Center<http://developer.toradex.com/> | Request Samples<http://www.toradex.com/shop/request-samples> | Challenge<http://challenge.toradex.com/>
Meet our engineers at:<https://www.toradex.com/events>
- GPU Technology Conference, Silicon Valley, CA, United States, Apr 04-07, 2016
- Embedded Systems Conference (ESC) Boston 2016, Boston, MA, United States, Apr 13-14, 2016
- NXP FTF Tech Forum 2016, Austin, TX, United States, May 16-19, 2016
Join our webinar:
- Getting Started with Azure IoT on Devices. Register here<https://www.toradex.com/webinars/getting-started-with-azure-iot-on-devices>.