[meta-xilinx] [PATCH] *-zynq7: Change some boards to mainline U-Boot by default

[Nathan Rossi]

Change the microzed-zynq7, picozed-zynq7, zedboard-zynq7 and zybo-zynq7
machines to use the mainline U-Boot by default.

All these machines can be supported by the mainline U-Boot and do not
require any of the drivers/features that are only provided in the Xilinx
vendor tree (u-boot-xlnx).

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 conf/machine/microzed-zynq7.conf | 1 +
 conf/machine/picozed-zynq7.conf  | 1 +
 conf/machine/zedboard-zynq7.conf | 1 +
 conf/machine/zybo-zynq7.conf     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index ec28c3ffbf..aaca1ca8d9 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -9,6 +9,7 @@ require conf/machine/include/machine-xilinx-board.inc
 MACHINE_FEATURES = "ext2 vfat usbhost"
 
 # u-boot configuration
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "zynq_microzed_config"
 SPL_BINARY = "spl/boot.bin"
 
diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf
index 2fb310b97c..9f8a37e884 100644
--- a/conf/machine/picozed-zynq7.conf
+++ b/conf/machine/picozed-zynq7.conf
@@ -13,6 +13,7 @@ require conf/machine/include/machine-xilinx-board.inc
 MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 
 # u-boot configuration
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "zynq_picozed_config"
 SPL_BINARY = "spl/boot.bin"
 
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
index 58cee372fd..a157eaf189 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/conf/machine/zedboard-zynq7.conf
@@ -13,6 +13,7 @@ require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
 
 # u-boot configuration
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "zynq_zed_config"
 SPL_BINARY = "spl/boot.bin"
 
diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf
index ddddfba1d4..a3e9c06b3b 100644
--- a/conf/machine/zybo-zynq7.conf
+++ b/conf/machine/zybo-zynq7.conf
@@ -13,6 +13,7 @@ require conf/machine/include/machine-xilinx-board.inc
 MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 
 # u-boot configuration
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "zynq_zybo_config"
 SPL_BINARY = "spl/boot.bin"
 
-- 
2.11.0