colibri-vf.conf: change some assignments to soft default

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@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Brandon Shibley 2016-03-23 16:57:27 -07:00 committed by Otavio Salvador
parent 36a638abe1
commit 3a950d07d7

View File

@ -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"