versal-generic: Boot QEMU from OSPI file when available

Set QEMU to boot using the static OSPI file when it is available.

Signed-off-by: John Toomey <john.toomey@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 3582944b..1356f91c 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -95,24 +95,32 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # ? dcc ?                                  - linux serial2 (????)
 QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
 
+QB_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 ''} \
     "
 
 # PLM instance args
 QB_PLM_OPT = " \
     -M microblaze-fdt \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw  \
     -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \
     -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \
-    -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,addr=0xF1110624,data=0x0,data-len=4 \
     -device loader,addr=0xF1110620,data=0x1,data-len=4 \
     -hw-dtb ${QEMU_HW_DTB_PMC} \
     -display none \
     "
+
+QB_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_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 
 #### No additional settings should be after the Postamble