diff options
| -rw-r--r-- | conf/machine/ep108-zynqmp.conf | 3 | ||||
| -rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 1 |
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%" |