1 files changed, 9 insertions, 4 deletions

diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index dd6966a0..94d52f38 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -44,8 +44,6 @@ PLM_IMAGE_NAME ?= "plm-versal-mb"
 PSM_FIRMWARE_DEPLOY_DIR ?= "{TOPDIR}/versalmbtmp/deploy/images/versal-mb"
 PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
 
-# We use the vc-p-a2197-00-versal DTB from the external-hdf.
-HDF_MACHINE = "vc-p-a2197-00-versal"
 
 # This machine has a QEMU model, runqemu setup:
 QB_MEM = "-m 8G"
@@ -61,8 +59,15 @@ 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"
 
+QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PS ?="${QEMU_HW_DTB_PATH}/board-versal-ps-vc-p-a2197-00.dtb"
+QEMU_HW_DTB_PMC ?="${QEMU_HW_DTB_PATH}/board-versal-pmc-vc-p-a2197-00.dtb"
+
+QEMU_HW_DTB_PS_vp1202-versal = "${QEMU_HW_DTB_PATH}/board-versal-vp1202-ps-virt.dtb"
+QEMU_HW_DTB_PMC_vp1202-versal = "${QEMU_HW_DTB_PATH}/board-versal-vp1202-pmc-virt.dtb"
+
 QB_OPT_APPEND_append_qemuboot-xilinx = " \
-    -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
+    -hw-dtb ${QEMU_HW_DTB_PS} \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
     "
@@ -77,7 +82,7 @@ QB_PLM_OPT = " \
     -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 \
-    -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
+    -hw-dtb ${QEMU_HW_DTB_PMC} \
     -display none \
     "
 QB_OPT_APPEND_append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"