[meta-xilinx] [PATCH V2 4/5] qemuzynqmp: Update to take advantage of Xilinx's QEMU

[Alistair Francis]

Now that we use the Xilinx QEMU we can base the qemuzynqmp machine on the
ZCU102 instead of the EP108. We also need to make sure that the QEMU
hardware device tree is built.

Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
---
 conf/machine/qemuzynqmp.conf    | 11 ++++++++---
 conf/machine/zcu102-zynqmp.conf |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf
index 8b4dd5d..21e2162 100644
--- a/conf/machine/qemuzynqmp.conf
+++ b/conf/machine/qemuzynqmp.conf
@@ -1,7 +1,12 @@
 #@TYPE: Machine
 #@NAME: qemuzynqmp
-#@DESCRIPTION: Zynq UltraScale+ QEMU machine support ('xlnx-ep108' model)
+#@DESCRIPTION: Zynq UltraScale+ QEMU machine support ('xlnx-zcu102' model)
 
-MACHINEOVERRIDES =. "ep108-zynqmp:"
+MACHINEOVERRIDES =. "zcu102-zynqmp:"
 
-require conf/machine/ep108-zynqmp.conf
+require conf/machine/zcu102-zynqmp.conf
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
+
+DEPLOY_KERNEL_DTB_qemuzynqmp = "1"
+MACHINE_DEVICETREE = "qemu/qemuzcu102-arm.dts"
diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
index 75a94a3..a7c76e6 100644
--- a/conf/machine/zcu102-zynqmp.conf
+++ b/conf/machine/zcu102-zynqmp.conf
@@ -9,6 +9,9 @@ require conf/machine/include/machine-xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
+# This machine has a qemu machine model
+EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
+
 UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
-- 
2.7.4