summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-04-21 11:06:12 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2015-04-21 11:06:12 +1000
commit2969c4f775f11f747070c3943c8c7cd179c350ec (patch)
tree719b8a78e69546be6b9e3bcfb4cf974e5adcb86e /conf/machine/include
parent1115f0f650897065b2dd384c303787f7978cab83 (diff)
downloadmeta-xilinx-2969c4f775f11f747070c3943c8c7cd179c350ec.tar.gz
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 <nathan.rossi@xilinx.com>
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/machine-xilinx-default.inc3
1 files changed, 1 insertions, 2 deletions
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%"
15PREFERRED_VERSION_linux-yocto ?= "3.19%" 15PREFERRED_VERSION_linux-yocto ?= "3.19%"
16 16
17# U-Boot Configuration 17# U-Boot Configuration
18PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" 18PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx"
19PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
20PREFERRED_VERSION_u-boot-xlnx ?= "v2015.01%" 19PREFERRED_VERSION_u-boot-xlnx ?= "v2015.01%"
21 20
22UBOOT_SUFFIX ?= "img" 21UBOOT_SUFFIX ?= "img"