summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-05-30 18:46:21 +1000
committerNathan Rossi <nathan@nathanrossi.com>2017-05-30 18:46:21 +1000
commit2475a0fb482c3c68303018340e68fc304b2be8b9 (patch)
treec7a1007c546a3bbaf4a8ef498c007139c8d1100f /conf
parent4a7e3d5195f8b57fa95b2e76fd737d3752165b6f (diff)
downloadmeta-xilinx-2475a0fb482c3c68303018340e68fc304b2be8b9.tar.gz
*-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 <nathan@nathanrossi.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/microzed-zynq7.conf1
-rw-r--r--conf/machine/picozed-zynq7.conf1
-rw-r--r--conf/machine/zybo-zynq7.conf1
3 files changed, 3 insertions, 0 deletions
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
9MACHINE_FEATURES = "ext2 vfat usbhost" 9MACHINE_FEATURES = "ext2 vfat usbhost"
10 10
11# u-boot configuration 11# u-boot configuration
12PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
12UBOOT_MACHINE = "zynq_microzed_config" 13UBOOT_MACHINE = "zynq_microzed_config"
13SPL_BINARY = "spl/boot.bin" 14SPL_BINARY = "spl/boot.bin"
14 15
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
13MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 13MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
14 14
15# u-boot configuration 15# u-boot configuration
16PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
16UBOOT_MACHINE = "zynq_picozed_config" 17UBOOT_MACHINE = "zynq_picozed_config"
17SPL_BINARY = "spl/boot.bin" 18SPL_BINARY = "spl/boot.bin"
18 19
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
13MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" 13MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
14 14
15# u-boot configuration 15# u-boot configuration
16PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
16UBOOT_MACHINE = "zynq_zybo_config" 17UBOOT_MACHINE = "zynq_zybo_config"
17SPL_BINARY = "spl/boot.bin" 18SPL_BINARY = "spl/boot.bin"
18 19