aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2015-07-23 21:23:33 +1000
committerNathan Rossi <nathan@nathanrossi.com>2015-07-23 23:59:13 +1000
commit9ab92ee087dba5efe56a0782573cec2ffaa4d615 (patch)
treeeef719138890aa4da885b6c827d7447dbeca13a4
parent46a21486240f4c76c30157d2bf6ead9966c1755e (diff)
downloadmeta-xilinx-9ab92ee087dba5efe56a0782573cec2ffaa4d615.tar.gz
meta-xilinx-9ab92ee087dba5efe56a0782573cec2ffaa4d615.tar.bz2
meta-xilinx-9ab92ee087dba5efe56a0782573cec2ffaa4d615.zip
ep108-zynqmp: Remove pinning of custom QEMU version
* Upstream QEMU (2.4+) has support for the ep108 machine model Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--conf/machine/ep108-zynqmp.conf4
1 files changed, 0 insertions, 4 deletions
diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf
index 9e2fb891..a2e949f7 100644
--- a/conf/machine/ep108-zynqmp.conf
+++ b/conf/machine/ep108-zynqmp.conf
@@ -11,10 +11,6 @@ MACHINE_FEATURES = ""
# This machine has a qemu machine model
EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
-# Mainline QEMU does not support Zynq MP, use the Zynq MP specific version.
-PREFERRED_VERSION_qemu-native ?= "2.2.0+master+zynqmp%"
-PREFERRED_VERSION_nativesdk-qemu ?= "2.2.0+master+zynqmp%"
-
SERIAL_CONSOLE = "115200 ttyPS0"
# Use ZynqMP recipes for Kernal and U-Boot