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

[Brandon Shibley]

Changed some machine variable assignments in colibri-vf.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-vf.conf | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 09b51af..b224418 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -16,16 +16,16 @@ KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb"
 # U-Boot expects the kernel and device tree directly in /boot of the rootfs
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree"

-PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/kernel-module-mcc = "kernel-module-mcc-toradex"
-PREFERRED_PROVIDER_virtual/kernel-module-mcc-dev = "kernel-module-mcc-toradex"
-PREFERRED_VERSION_mqxboot = "1.%"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
+PREFERRED_PROVIDER_virtual/kernel-module-mcc ?= "kernel-module-mcc-toradex"
+PREFERRED_PROVIDER_virtual/kernel-module-mcc-dev ?= "kernel-module-mcc-toradex"
+PREFERRED_VERSION_mqxboot ?= "1.%"

 # U-Boot NAND binary includes 0x400 padding required for NAND boot
-UBOOT_BINARY = "u-boot-nand.imx"
-UBOOT_MAKE_TARGET = "u-boot-nand.imx"
-UBOOT_MACHINE = "colibri_vf_defconfig"
+UBOOT_BINARY ?= "u-boot-nand.imx"
+UBOOT_MAKE_TARGET ?= "u-boot-nand.imx"
+UBOOT_MACHINE ?= "colibri_vf_defconfig"

 IMAGE_FSTYPES = "tar.bz2 ubifs ubi"

@@ -34,6 +34,6 @@ MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F"
 UBINIZE_ARGS = " -p 128KiB -m 2048 -s 2048"
 UBI_VOLNAME = "rootfs"

-SERIAL_CONSOLE = "115200 ttyLP0"
+SERIAL_CONSOLE ?= "115200 ttyLP0"

-MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
+MACHINE_FEATURES += "apm usbgadget usbhost vfat alsa touchscreen"
--
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>.