From 2969c4f775f11f747070c3943c8c7cd179c350ec Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 21 Apr 2015 11:06:12 +1000 Subject: machine-xilinx-default.inc: Use ??= for preferred provider * Setup the preferred provider for virtual/bootloader with ??= * Remove setting of "u-boot" preferred provider Signed-off-by: Nathan Rossi --- conf/machine/ep108-zynqmp.conf | 1 - conf/machine/include/machine-xilinx-default.inc | 3 +-- conf/machine/qemuzynqmp.conf | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf index 45f20dcb..c8f0ccaa 100644 --- a/conf/machine/ep108-zynqmp.conf +++ b/conf/machine/ep108-zynqmp.conf @@ -13,7 +13,6 @@ SERIAL_CONSOLE = "115200 ttyPS0" # Use ZynqMP recipes for Kernal and U-Boot PREFERRED_PROVIDER_virtual/kernel ?= "linux-zynqmp-mainline" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-zynqmp-mainline" -PREFERRED_PROVIDER_u-boot ?= "u-boot-zynqmp-mainline" UBOOT_MACHINE = "xilinx_zynqmp_config" UBOOT_LOADADDRESS = "0x80000" diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index d26c3096..18716cd7 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -15,8 +15,7 @@ PREFERRED_VERSION_linux-xlnx ?= "3.14%" PREFERRED_VERSION_linux-yocto ?= "3.19%" # U-Boot Configuration -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" -PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" +PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx" PREFERRED_VERSION_u-boot-xlnx ?= "v2015.01%" UBOOT_SUFFIX ?= "img" diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf index 8cbb5b13..d212190a 100644 --- a/conf/machine/qemuzynqmp.conf +++ b/conf/machine/qemuzynqmp.conf @@ -18,7 +18,6 @@ SERIAL_CONSOLE = "115200 ttyPS0" # Use ZynqMP recipes for Kernal and U-Boot PREFERRED_PROVIDER_virtual/kernel ?= "linux-zynqmp-mainline" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-zynqmp-mainline" -PREFERRED_PROVIDER_u-boot ?= "u-boot-zynqmp-mainline" UBOOT_MACHINE = "xilinx_zynqmp_config" UBOOT_LOADADDRESS = "0x80000" -- cgit v1.2.3-54-g00ecf