meta-xilinx-core: Adjust QB_PMU and QB_PLM to QEMU_HW_ prefix

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

3 files changed, 8 insertions, 8 deletions

diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 5dc911ba..baf0d8c5 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -77,7 +77,7 @@ QB_OPT_APPEND += " \
     "
 
 # PLM instance args
-QB_PLM_OPT = " \
+QEMU_HW_PLM_OPT = " \
     -M microblaze-fdt \
     -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
     -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
@@ -92,9 +92,9 @@ QEMU_HW_FW_FILES = " \
     -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 \
 "
-QB_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
+QEMU_HW_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
 
-QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND += " -plm-args '${QEMU_HW_PLM_OPT}'"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 92c56397..a0fa8014 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -76,7 +76,7 @@ QB_OPT_APPEND += " \
     "
 
 # PLM instance args
-QB_PLM_OPT = " \
+QEMU_HW_PLM_OPT = " \
     -M microblaze-fdt \
     -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
     -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
@@ -91,9 +91,9 @@ QEMU_HW_FW_FILES = " \
     -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 \
 "
-QB_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
+QEMU_HW_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
 
-QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND += " -plm-args '${QEMU_HW_PLM_OPT}'"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 16f4723f..ea7b78ad 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -115,7 +115,7 @@ QB_OPT_APPEND += " \
     ${@qemu_add_extra_args(d)} \
     "
 
-QB_PMU_OPT = " \
+QEMU_HW_PMU_OPT = " \
     -M microblaze-fdt \
     -display none \
     -hw-dtb ${QEMU_HW_DTB_PMU} \
@@ -125,7 +125,7 @@ QB_PMU_OPT = " \
     -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
     "
 
-QB_OPT_APPEND += " -pmu-args '${QB_PMU_OPT}'"
+QB_OPT_APPEND += " -pmu-args '${QEMU_HW_PMU_OPT}'"
 
 #### No additional settings should be after the Postamble
 #### Postamble