meta-xilinx-bsp: cleanup qemu references

Move IMAGE_CLASSES setting to common machine-xilinx-qemu.inc, also add
preferred provider for the xilinx specific qemu components.

Adjust the various BSPs to remove duplicate references to these and
non-Xilinx versions of qemu.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

13 files changed, 7 insertions, 39 deletions

diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
index 5eb4b5c4..3d3eae5c 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
@@ -1,8 +1,14 @@
 # This include is used to setup default QEMU and qemuboot config for meta-xilinx
 # machines.
 
+# Use the xilinx specific version for these users
+IMAGE_CLASSES += "qemuboot-xilinx"
+
 # depend on qemu-helper-native, which will depend on QEMU
-EXTRA_IMAGEDEPENDS += "qemu-helper-native"
+EXTRA_IMAGEDEPENDS += "qemu-xilinx-helper-native"
+
+PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
+PREFERRED_PROVIDER_qemu = "qemu-xilinx"
 
 def qemu_default_dtb(d):
     if d.getVar("IMAGE_BOOT_FILES", True):
diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
index f4ddb6df..a3c7005f 100644
--- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
@@ -19,7 +19,6 @@ KERNEL_IMAGETYPE ?= "linux.bin.ub"
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 
 # This machine is a targeting a QEMU model, runqemu setup:
-IMAGE_CLASSES += "qemuboot"
 QB_MEM = "-m 256"
 QB_MACHINE = "-machine petalogix-ml605"
 QB_OPT_APPEND = "-nographic -serial mon:stdio"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 17c69b1b..0eeda5c2 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -17,8 +17,6 @@ HDF_MACHINE = "zc702-zynq7"
 # Use the networking setup from qemuarm
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 
-IMAGE_CLASSES += "qemuboot-xilinx"
-
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
 QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
@@ -28,10 +26,6 @@ QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
 QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
-# 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"
-
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
         -nographic -serial null -serial mon:stdio \
diff --git a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
index 3a21eb78..446f02f0 100644
--- a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
+++ b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
@@ -16,7 +16,6 @@ SERIAL_CONSOLE = "115200 ttyUL0"
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 
 # This machine is a targeting a QEMU model, runqemu setup:
-IMAGE_CLASSES += "qemuboot"
 QB_MEM = "-m 256"
 QB_MACHINE = "-machine petalogix-s3adsp1800"
 QB_OPT_APPEND = "-nographic -serial mon:stdio"
diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index d042245b..4a5c5b02 100644
--- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -13,8 +13,6 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 SERIAL_CONSOLE = "115200 ttyAMA0"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
-
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
 IMAGE_FSTYPES += "wic.qemu-sd"
@@ -38,7 +36,6 @@ IMAGE_BOOT_FILES += " \
     boot.scr \
 "
 # This machine has a QEMU model, runqemu setup:
-IMAGE_CLASSES += "qemuboot-xilinx"
 QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 4096"
 QB_DEFAULT_KERNEL = "none"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 67867535..cb1921dd 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -13,8 +13,6 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 SERIAL_CONSOLE = "115200 ttyAMA0"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
-
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
 IMAGE_FSTYPES += "wic.qemu-sd"
@@ -44,7 +42,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
 
 
 # This machine has a QEMU model, runqemu setup:
-IMAGE_CLASSES += "qemuboot-xilinx"
 QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 4096"
 QB_DEFAULT_KERNEL = "none"
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index 0128a9ca..c5ca7d77 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -8,7 +8,5 @@ require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
-
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
 
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 92977dc7..fe234cfd 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -13,8 +13,6 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 SERIAL_CONSOLE = "115200 ttyAMA0"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
-
 EXTRA_IMAGEDEPENDS += " \
    arm-trusted-firmware \
    virtual/boot-bin \
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index cd23a9d9..c29a2c86 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -36,8 +36,6 @@ IMAGE_BOOT_FILES += " \
                 boot.scr \
                 "
 
-IMAGE_CLASSES += "qemuboot-xilinx"
-# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
 QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
@@ -47,10 +45,6 @@ QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
 QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
-# 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"
-
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
         -nographic -serial null -serial mon:stdio \
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 5273a66b..5037b798 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -36,8 +36,6 @@ IMAGE_BOOT_FILES += " \
                 boot.scr \
                 "
 
-IMAGE_CLASSES += "qemuboot-xilinx"
-# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
 QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
@@ -47,10 +45,6 @@ QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
 QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
-# 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"
-
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
         -nographic -serial null -serial mon:stdio \
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 8fda6bbd..ecf85589 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -38,15 +38,11 @@ IMAGE_BOOT_FILES += " \
                 "
 
 # This machine has a QEMU model, runqemu setup:
-IMAGE_CLASSES += "qemuboot-xilinx"
 QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 4096"
 QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 
-# Use qemu-xilinx instead of mainline
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
-
 # Use the multiarch script instead of launching QEMU directly
 QB_SYSTEM_NAME_append = "-multiarch"
 
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index 3f2d3f5e..a8a94330 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -8,6 +8,4 @@ require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
-
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 3cc3d641..7bf72212 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -8,7 +8,5 @@ require conf/machine/include/machine-xilinx-qemu.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
-PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
-
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"