1 files changed, 2 insertions, 8 deletions

diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index e9767d98..70ea9e0e 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -4,11 +4,10 @@
 
 require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "ext2 vfat"
 
-EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
-
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
@@ -17,15 +16,10 @@ MACHINE_DEVICETREE = "qemu/qemuzynq.dts"
 # Use the networking setup from qemuarm
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 
-# For runqemu
-IMAGE_CLASSES += "qemuboot"
-QB_SYSTEM_NAME = "qemu-system-arm"
+# This machine is a targeting a QEMU model, runqemu setup:
 QB_MEM = "-m 1024"
 QB_MACHINE = "-machine xilinx-zynq-a9"
-QB_DTB = "${MACHINE}.dtb"
 QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio"
-QB_DEFAULT_FSTYPE = "cpio"
-QB_KERNEL_CMDLINE_APPEND = "console=ttyPS0"
 QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@"
 QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0"