versal-generic: Add runqemu support for versal-generic

This patch will add runqemu support for versal-generic when
INITRAMFS/INITRD/EXT4 configurations.

Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 3509d8c4..a1e0975a 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -29,7 +29,9 @@ HDF_MACHINE = "vck190-versal"
 
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
-IMAGE_FSTYPES += "wic.qemu-sd"
+# Add wic.qemu-sd only if initramfs_image not set due to circular dependecies
+IMAGE_FSTYPES:append = " ${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot.qemu-sd-fatimg'}"
+
 WKS_FILES ?= "sdimage-bootpart.wks"
 
 EXTRA_IMAGEDEPENDS += " \
@@ -58,12 +60,8 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
-
-# Use booti 80000 6000000 4000000 to launch
-QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "${@qemu_rootfs_params(d,'fstype')}"
+QB_ROOTFS_OPT:qemuboot-xilinx = " ${@qemu_rootfs_params(d,'rootfs-opt')}"
 
 QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
 QEMU_HW_DTB_PS ?="${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
@@ -74,8 +72,8 @@ QEMU_HW_DTB_PMC_vp1202-versal = "${QEMU_HW_DTB_PATH}/board-versal-vp1202-pmc-vir
 
 QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
-    -display none \
-    -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
+    -serial null -serial null  -serial mon:stdio -serial null -display none \
+    ${@qemu_add_extra_args(d)} \
     "
 
 # PLM instance args
@@ -84,7 +82,7 @@ QB_PLM_OPT = " \
     -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw  \
     -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
     -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/pmc_cdo.bin,addr=0xf2000000,force-raw \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
     -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
     -device loader,addr=0xF1110624,data=0x0,data-len=4 \
     -device loader,addr=0xF1110620,data=0x1,data-len=4 \