zynq-generic: Remove hardcoded -initrd and use runqemu instead

Change rootfs to cpio.gz, and runqemu will automatically load it as an initrd

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

2 files changed, 2 insertions, 3 deletions

diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index d169c513..dd02ab1f 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -5,7 +5,7 @@ INHERIT += "xilinx-deprecated"
 MACHINE_FEATURES_BACKFILL_CONSIDERED += "rtc"
 
 # File System Configuration
-IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz.u-boot"
+IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz cpio.gz.u-boot"
 
 # Kernel Configuration
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx"
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 3271051d..59fc3976 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -32,14 +32,13 @@ QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -n
 QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
-QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
+QB_DEFAULT_FSTYPE = "cpio.gz"
 QB_DTB = "system.dtb"
 QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
         -nographic -serial null -serial mon:stdio \
-        -initrd ${DEPLOY_DIR_IMAGE}/@ROOTFS@ \
         -gdb tcp::9000 \
         -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \
         -device loader,addr=0xf8000140,data=0x00500801,data-len=4 \