aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2015-09-09 14:57:37 +1000
committerNathan Rossi <nathan@nathanrossi.com>2015-09-09 14:57:37 +1000
commit559f5add73526911c98f619fbe5369a912dba568 (patch)
treec8987b42df77a2a42d9b23ea176ef1f7b29f6505
parent49ebb273325ce17f723b402ebcd05673640fd919 (diff)
downloadmeta-xilinx-559f5add73526911c98f619fbe5369a912dba568.tar.gz
meta-xilinx-559f5add73526911c98f619fbe5369a912dba568.tar.bz2
meta-xilinx-559f5add73526911c98f619fbe5369a912dba568.zip
ep108-zynqmp: Use mainline u-boot by default
* Upstream u-boot supports ZynqMP * Default all 'zynqmp' machines to use upstream u-boot Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--conf/machine/ep108-zynqmp.conf3
-rw-r--r--conf/machine/include/machine-xilinx-default.inc1
2 files changed, 1 insertions, 3 deletions
diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf
index 8283fe15..9efae1e4 100644
--- a/conf/machine/ep108-zynqmp.conf
+++ b/conf/machine/ep108-zynqmp.conf
@@ -13,9 +13,6 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
SERIAL_CONSOLE = "115200 ttyPS0"
-# Use ZynqMP recipes for U-Boot
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-zynqmp-mainline"
-
KERNEL_DEVICETREE = "xilinx/zynqmp-ep108.dtb"
UBOOT_MACHINE = "xilinx_zynqmp_config"
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index a38fb0ed..bf789519 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -17,6 +17,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.19%"
# U-Boot Configuration
XILINX_DEFAULT_UBOOT := "u-boot-xlnx"
+XILINX_DEFAULT_UBOOT_zynqmp := "u-boot"
PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}"
PREFERRED_VERSION_u-boot-xlnx ?= "v2015.01%"