meta-xilinx-core: Rename QB_OSPI_FILE and QB_HW_FILE to prefix QEMU_HW_...

Adjust the qemu-system-aarch64-multiarch script to remove reference to these.

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

3 files changed, 9 insertions, 10 deletions

diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index af34ce4e..5dc911ba 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -68,12 +68,12 @@ QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # ? dcc ?                                  - linux serial2 (????)
 QEMU_HW_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
-QB_OSPI_FILE ??= ""
+QEMU_HW_OSPI_FILE ??= ""
 
 QB_OPT_APPEND += " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
     ${@qemu_add_extra_args(d)} \
-    ${@'-bootbin ${QB_OSPI_FILE}' if d.getVar('QB_OSPI_FILE') != '' else ''} \
+    ${@'-bootbin ${QEMU_HW_OSPI_FILE}' if d.getVar('QEMU_HW_OSPI_FILE') != '' else ''} \
     "
 
 # PLM instance args
@@ -87,12 +87,12 @@ QB_PLM_OPT = " \
     -display none \
     "
 
-QB_FW_FILES = " \
+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 \
 "
-QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
+QB_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
 
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index eee867a7..92c56397 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -67,12 +67,12 @@ QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 # hw serial3 pl011 (0xf1930000)        - linux serial1 (ttyAMA1)
 QEMU_HW_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
-QB_OSPI_FILE ??= ""
+QEMU_HW_OSPI_FILE ??= ""
 
 QB_OPT_APPEND += " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
     ${@qemu_add_extra_args(d)} \
-    ${@'-bootbin ${QB_OSPI_FILE}' if d.getVar('QB_OSPI_FILE') != '' else ''} \
+    ${@'-bootbin ${QEMU_HW_OSPI_FILE}' if d.getVar('QEMU_HW_OSPI_FILE') != '' else ''} \
     "
 
 # PLM instance args
@@ -86,12 +86,12 @@ QB_PLM_OPT = " \
     -display none \
     "
 
-QB_FW_FILES = " \
+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 \
 "
-QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
+QB_PLM_OPT += "${@d.getVar('QEMU_HW_FW_FILES') if d.getVar('QEMU_HW_OSPI_FILE') == '' else ''}"
 
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
index 00fc41c3..4f80c7a2 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
@@ -103,8 +103,7 @@ if PMU_args:
 
 if bootbin_arg:
     if not os.path.isfile(bootbin_arg):
-        print(f"\nERROR: bootbin file not found at {bootbin_arg}"
-            "       Please build and ospi_image or set QB_OSPI_BIN variable to prebuilt file\n")
+        print(f"\nERROR: bootbin file not found at {bootbin_arg}\n")
         sys.exit(1)
 
     shutil.copyfile(bootbin_arg, f'{mach_path}/boot.bin')