qemuboot-xilinx: Refactor QEMU_HW_BOOT_MODE to accept only value

Refactor QEMU_HW_BOOT_MODE to accept only boot mode value and move
"-boot mode" to qb_extra_args. This makes checking for boot mode value
easier in getVar operations.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
index 2b704645..45d7f3c6 100644
--- a/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass
@@ -14,7 +14,7 @@ QB_DTB ?= "${@qemu_default_dtb(d)}"
 # 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
-QEMU_HW_BOOT_MODE ?= "-boot mode=5"
+QEMU_HW_BOOT_MODE ?= "5"
 
 
 # ZynqMP or Versal SD and eMMC drive index.
@@ -71,10 +71,10 @@ def qemu_add_extra_args(data):
             qb_extra_args = ' -device loader,file=%s,addr=%s,force-raw=on' % (kernel_image, kernel_loadaddr)
             qb_extra_args += ' -device loader,file=%s,addr=%s,force-raw=on' % (bootscr_image, bootscr_loadaddr)
         if soc_family in ('versal', 'versal-net'):
-            qb_extra_args += ' %s' % boot_mode
+            qb_extra_args += ' -boot mode=%s' % boot_mode
     else:
         if soc_family in ('zynqmp', 'versal', 'versal-net'):
-            qb_extra_args = ' %s' % boot_mode
+            qb_extra_args = ' -boot mode=%s' % boot_mode
     return qb_extra_args
 
 def qemu_rootfs_params(data, param):