From b35923a8b1d97411eae9caa342695e2d167fd922 Mon Sep 17 00:00:00 2001 From: Brandon Shibley Date: Wed, 23 Mar 2016 16:57:28 -0700 Subject: [PATCH] colibri-imx6.conf: change some assignments to soft default 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 --- 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"