From 78afe11ba2e7585d48ac4e3c38b71906c83cbe6c Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 25 Jun 2020 18:26:03 -0700 Subject: [PATCH] config.mk: Update QEMU run command for generic and sifive fu540 platforms Since QEMU v5.1, if there is no "-bios" option provided, the default OpenSBI firmware will be loaded by QEMU as the BIOS automatically, hence to load fw_payload type image, we should explicitly pass the "-bios" option to QEMU. Signed-off-by: Bin Meng Reviewed-by: Atish Patra --- platform/generic/config.mk | 2 +- platform/sifive/fu540/config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/generic/config.mk b/platform/generic/config.mk index 8d63ece..8151974 100644 --- a/platform/generic/config.mk +++ b/platform/generic/config.mk @@ -15,7 +15,7 @@ platform-ldflags-y = # Command for platform specific "make run" platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M virt -m 256M \ - -nographic -kernel $(build_dir)/platform/generic/firmware/fw_payload.elf + -nographic -bios $(build_dir)/platform/generic/firmware/fw_payload.elf # Blobs to build FW_TEXT_START=0x80000000 diff --git a/platform/sifive/fu540/config.mk b/platform/sifive/fu540/config.mk index e76adcd..23169b1 100644 --- a/platform/sifive/fu540/config.mk +++ b/platform/sifive/fu540/config.mk @@ -15,7 +15,7 @@ platform-ldflags-y = # Command for platform specific "make run" platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M sifive_u -m 256M \ - -nographic -kernel $(build_dir)/platform/sifive/fu540/firmware/fw_payload.elf + -nographic -bios $(build_dir)/platform/sifive/fu540/firmware/fw_payload.elf # Blobs to build FW_TEXT_START=0x80000000