meta-xilinx-core: qemuboot-xilinx.bbclass: Rename QB_ vars

QB_ variables are automatically included in the generated qemuboot.conf
files, even if they are not used by runqemu.  Rename various AMD specific
values to avoid them being added to the file.

QB_BOOT_MODE -> QEMU_HW_BOOT_MODE
QB_SD_DRIVE_INDEX -> QEMU_HW_SD_DRIVE_INDEX

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

1 files changed, 6 insertions, 6 deletions

diff --git a/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
index df7016d4..67612d05 100644
--- a/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
@@ -26,7 +26,7 @@ QB_DEFAULT_KERNEL:microblaze ?= "${@'simpleImage.mb' if \
 # https://docs.amd.com/r/en-US/ug585-zynq-7000-SoC-TRM/Boot-Mode-Pin-Settings
 # https://docs.amd.com/r/en-US/ug1085-zynq-ultrascale-trm/Boot-Modes
 # https://docs.amd.com/r/en-US/ug1304-versal-acap-ssdg/Boot-Device-Modes
-QB_BOOT_MODE ?= "-boot mode=5"
+QEMU_HW_BOOT_MODE ?= "-boot mode=5"
 
 
 # ZynqMP or Versal SD and eMMC drive index.
@@ -39,9 +39,9 @@ QB_BOOT_MODE ?= "-boot mode=5"
 # ZynqMP, Versal              eMMC0(secondary boot only)  2
 # ZynqMP, Versal              eMMC1                       3
 
-QB_SD_DRIVE_INDEX ?= "1"
-QB_SD_DRIVE_INDEX:zynq ?= "0"
-QB_SD_DRIVE_INDEX:versal-net ?= "0"
+QEMU_HW_SD_DRIVE_INDEX ?= "1"
+QEMU_HW_SD_DRIVE_INDEX:zynq ?= "0"
+QEMU_HW_SD_DRIVE_INDEX:versal-net ?= "0"
 
 inherit qemuboot
 
@@ -66,7 +66,7 @@ def qemu_add_extra_args(data):
     deploy_dir = data.getVar('DEPLOY_DIR_IMAGE') or ""
     machine_name = data.getVar('MACHINE') or ""
     soc_family = data.getVar('SOC_FAMILY') or ""
-    boot_mode = data.getVar('QB_BOOT_MODE') or ""
+    boot_mode = data.getVar('QEMU_HW_BOOT_MODE') or ""
     qb_extra_args = ''
     # Add kernel image and boot.scr to qemu boot command when initramfs_image supplied
     kernel_name = ''
@@ -94,7 +94,7 @@ def qemu_rootfs_params(data, param):
     bundle_image = data.getVar('INITRAMFS_IMAGE_BUNDLE') or ""
     soc_family = data.getVar('SOC_FAMILY') or ""
     tune_features = (data.getVar('TUNE_FEATURES') or []).split()
-    sd_index = data.getVar('QB_SD_DRIVE_INDEX') or ""
+    sd_index = data.getVar('QEMU_HW_SD_DRIVE_INDEX') or ""
     if 'microblaze' in tune_features:
         soc_family = 'microblaze'