versal confs: cleaning up unnecessary file loading in runqemu command

Removing dtb fatload in boot.scr and removing unnecessary image, dtb,
rootfs loading in runqemu command

dtb is being loaded through boot.bin for versal so fatload through
boot.scr and loading into memory through runqemu commands are not
necessary (before this change dtb was essentially being loaded three
times)

image will be fatloaded through boot.scr (provided in sd image)

rootfs is provided through sd image

Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>

4 files changed, 0 insertions, 11 deletions

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 59b1e99e..f6337afa 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
@@ -50,14 +50,10 @@ QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
 QB_OPT_APPEND_append_qemuboot-xilinx = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/Image,addr=0x80000 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.cpio.gz.u-boot,addr=0x6000000 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x4000000 \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
     "
-
 # PLM instance args
 QB_PLM_OPT = " \
     -M microblaze-fdt \
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 7f2a8b63..028c2b18 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -56,9 +56,6 @@ QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
 QB_OPT_APPEND_append_qemuboot-xilinx = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/Image,addr=0x80000 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.cpio.gz.u-boot,addr=0x6000000 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x4000000 \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index 07b0f323..9bf3593d 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -60,9 +60,6 @@ QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
 QB_OPT_APPEND_append_qemuboot-xilinx = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/Image,addr=0x80000 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.cpio.gz.u-boot,addr=0x6000000 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x4000000 \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal
index 552e8d02..10e83cd0 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal
@@ -1,4 +1,3 @@
 setenv bootargs $bootargs root=/dev/mmcblk0p2 rw rootwait clk_ignore_unused
-fatload mmc 0 @@DEVICETREE_ADDRESS@@ @@DEVICE_TREE_NAME@@
 fatload mmc $sdbootdev:$partid @@KERNEL_LOAD_ADDRESS@@ @@KERNEL_IMAGETYPE@@
 @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ - @@DEVICETREE_ADDRESS@@