meta-xilinx-core: machines: Refactor QB_* to use dynamic paths

Instead of using the hard coded path, ${DEPLOY_DIR_IMAGE} we should be using
@DEPLOY_DIR_IMAGE@ where applicable.  The exception is QB_DTB where the
qemuboot.conf export function will sanitize the path for us.

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

3 files changed, 22 insertions, 22 deletions

diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index d99f3d09..d3e02ce7 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -55,7 +55,7 @@ QB_DEFAULT_KERNEL ?= "none"
 QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
 QB_KERNEL_CMDLINE_APPEND ?= ""
 
-QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PATH ?= "qemu-hw-devicetrees/multiarch"
 QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
 QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 
@@ -70,11 +70,11 @@ QEMU_HW_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
 QEMU_HW_OSPI_FILE ??= ""
 
-QB_DTB = "${QEMU_HW_DTB_PS}"
+QB_DTB = "${DEPLOY_DIR_IMAGE}/${QEMU_HW_DTB_PS}"
 
 QB_OPT_APPEND += " \
     ${@qemu_add_extra_args(d)} \
-    ${@'-bootbin ${QEMU_HW_OSPI_FILE}' if d.getVar('QEMU_HW_OSPI_FILE') != '' else ''} \
+    ${@'-bootbin @DEPLOY_DIR_IMAGE@/${QEMU_HW_OSPI_FILE}' if d.getVar('QEMU_HW_OSPI_FILE') != '' else ''} \
     "
 
 # PLM instance args
@@ -84,14 +84,14 @@ QEMU_HW_PLM_OPT = " \
     -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
     -device loader,addr=0xF1110624,data=0x0,data-len=4 \
     -device loader,addr=0xF1110620,data=0x1,data-len=4 \
-    -hw-dtb ${QEMU_HW_DTB_PMC} \
+    -hw-dtb @DEPLOY_DIR_IMAGE@/${QEMU_HW_DTB_PMC} \
     -display none \
     "
 
 QEMU_HW_FW_FILES = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,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,file=@DEPLOY_DIR_IMAGE@/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,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 \
 "
 QEMU_HW_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
 
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 60d7fe1a..5dd5b036 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -55,7 +55,7 @@ QB_DEFAULT_KERNEL ?= "none"
 QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
 QB_KERNEL_CMDLINE_APPEND ?= ""
 
-QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PATH ?= "qemu-hw-devicetrees/multiarch"
 QEMU_HW_DTB_PS ?=  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
 QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 
@@ -69,11 +69,11 @@ QEMU_HW_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
 QEMU_HW_OSPI_FILE ??= ""
 
-QB_DTB = "${QEMU_HW_DTB_PS}"
+QB_DTB = "${DEPLOY_DIR_IMAGE}/${QEMU_HW_DTB_PS}"
 
 QB_OPT_APPEND += " \
     ${@qemu_add_extra_args(d)} \
-    ${@'-bootbin ${QEMU_HW_OSPI_FILE}' if d.getVar('QEMU_HW_OSPI_FILE') != '' else ''} \
+    ${@'-bootbin @DEPLOY_DIR_IMAGE@/${QEMU_HW_OSPI_FILE}' if d.getVar('QEMU_HW_OSPI_FILE') != '' else ''} \
     "
 
 # PLM instance args
@@ -83,14 +83,14 @@ QEMU_HW_PLM_OPT = " \
     -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
     -device loader,addr=0xF1110624,data=0x0,data-len=4 \
     -device loader,addr=0xF1110620,data=0x1,data-len=4 \
-    -hw-dtb ${QEMU_HW_DTB_PMC} \
+    -hw-dtb @DEPLOY_DIR_IMAGE@/${QEMU_HW_DTB_PMC} \
     -display none \
     "
 
 QEMU_HW_FW_FILES = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw=on \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw=on \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
+    -device loader,file=@DEPLOY_DIR_IMAGE@/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw=on \
+    -device loader,file=@DEPLOY_DIR_IMAGE@/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw=on \
+    -device loader,file=@DEPLOY_DIR_IMAGE@/plm-${MACHINE}.elf,cpu-num=1 \
 "
 QEMU_HW_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
 
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 71e24d3c..d87e5aad 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -65,7 +65,7 @@ QB_NETWORK_DEVICE ?= "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@M
 
 # Set variables for QEMU DTB PATH, PS DTB and PMU DTB for zynqmp_generic, this
 # allows user to use different QEMU HW DTB to match their board.
-QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PATH ?= "qemu-hw-devicetrees/multiarch"
 QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb"
 QEMU_HW_DTB_PMU ?= "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 
@@ -102,7 +102,7 @@ QEMU_HW_DTB_PMU ?= "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb"
 # 00000000fffc0000: 0x584e4c58 0x00000001 0x08000000 0x00000000
 # 00000000fffc0010: 0x00000010 0x00000000
 #
-QB_DTB = "${QEMU_HW_DTB_PS}"
+QB_DTB = "${DEPLOY_DIR_IMAGE}/${QEMU_HW_DTB_PS}"
 
 QB_OPT_APPEND += " \
     ${@qemu_zynqmp_unhalt(d, True)} \
@@ -110,18 +110,18 @@ QB_OPT_APPEND += " \
     -device loader,addr=0xfffc0008,data=0x0000000800000000,data-be=true,data-len=8 \
     -device loader,addr=0xfffc0010,data=0x1000000000000000,data-be=true,data-len=8 \
     -device loader,addr=0xffd80048,data=0xfffc0000,data-len=4,attrs-secure=on \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x100000,force-raw=on \
+    -device loader,file=@DEPLOY_DIR_IMAGE@/arm-trusted-firmware.elf,cpu-num=0 \
+    -device loader,file=@DEPLOY_DIR_IMAGE@/u-boot.elf \
+    -device loader,file=@DEPLOY_DIR_IMAGE@/system.dtb,addr=0x100000,force-raw=on \
     ${@qemu_add_extra_args(d)} \
     "
 
 QEMU_HW_PMU_OPT = " \
     -M microblaze-fdt \
     -display none \
-    -hw-dtb ${QEMU_HW_DTB_PMU} \
-    -kernel ${PMU_ROM} \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/${PMU_FIRMWARE_IMAGE_NAME}.elf \
+    -hw-dtb @DEPLOY_DIR_IMAGE@/${QEMU_HW_DTB_PMU} \
+    -kernel @DEPLOY_DIR_IMAGE@/${PMU_ROM} \
+    -device loader,file=@DEPLOY_DIR_IMAGE@/${PMU_FIRMWARE_IMAGE_NAME}.elf \
     -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
     -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
     "