machine-xilinx-qemu.inc: Adjust function to verify fstype is valid

Simplify the function to treat microblaze as a soc_family.  If we do not have
initramfs_image defined, then verify wic.qemu-sd is available before
returning that value, otherwise fall back to the dictionary.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>

1 files changed, 7 insertions, 6 deletions

diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
index 8cf9d4ed..0fcc5087 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
@@ -54,13 +54,14 @@ def qemu_rootfs_params(d,param):
             "zynqmp": "cpio.gz.u-boot",
             "versal": "cpio.gz.u-boot.qemu-sd-fatimg"
         }
-        if initramfs_image:
-            if 'microblaze' in tune_features:
-                return fstype_dict['microblaze']
-            else:
-                return fstype_dict[soc_family]
-        else:
+        if 'microblaze' in tune_features:
+            soc_family = 'microblaze'
+        if not initramfs_image:
+            image_fs = d.getVar('IMAGE_FSTYPES')
+            if 'wic.qemu-sd' in image_fs:
                 return 'wic.qemu-sd'
+        return fstype_dict[soc_family]
+
     elif param == 'rootfs-opt':
         if not initramfs_image or soc_family == 'versal':
             sd_index = "1"