From 2475a0fb482c3c68303018340e68fc304b2be8b9 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 30 May 2017 18:46:21 +1000 Subject: *-zynq7: Change some boards to mainline U-Boot by default Change the microzed-zynq7, picozed-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 --- conf/machine/microzed-zynq7.conf | 1 + conf/machine/picozed-zynq7.conf | 1 + conf/machine/zybo-zynq7.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf index ec28c3ff..aaca1ca8 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 2fb310b9..9f8a37e8 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/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf index ddddfba1..a3e9c06b 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" -- cgit v1.2.3-54-g00ecf