[meta-xilinx] [PATCH v2 2/2] zc706-zynq7: Add runqemu support

[Alistair Francis]

Add support for both mainline and Xilinx's QEMU.

Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
---
 README.md                     |  2 +-
 conf/machine/zc706-zynq7.conf | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 80e3dd9..c212085 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Boards/Machines supported by this layer:
 * Zynq:
   * [Zynq (QEMU)](conf/machine/qemu-zynq7.conf) - `qemu-zynq7` (QEMU Support)
   * [Xilinx ZC702](conf/machine/zc702-zynq7.conf) - `zc702-zynq7` (with QEMU support)
-  * [Xilinx ZC706](conf/machine/zc706-zynq7.conf) - `zc706-zynq7`
+  * [Xilinx ZC706](conf/machine/zc706-zynq7.conf) - `zc706-zynq7` (with QEMU support)
   * [Avnet MicroZed](conf/machine/microzed-zynq7.conf) - `microzed-zynq7`
   * [Avnet PicoZed](conf/machine/picozed-zynq7.conf) - `picozed-zynq7`
   * [Avnet/Digilent ZedBoard](conf/machine/zedboard-zynq7.conf) - `zedboard-zynq7`
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 2379aee..38c3b4b 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -12,6 +12,7 @@
 require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-board.inc
+require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 
@@ -31,3 +32,15 @@ IMAGE_BOOT_FILES += " \
 		uEnv.txt \
 		"
 
+# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine
+IMAGE_CLASSES += "qemuboot"
+QB_MEM = "-m 1024"
+QB_MACHINE = "-machine xilinx-zynq-a9"
+QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio"
+QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+
+# Xilinx's fork of QEMU has much better results, so let's default to that
+# Use qemu-xilinx instead of mainline
+PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
+
+IMAGE_CLASSES += "qemuboot-xilinx"
-- 
2.14.1