ron minnich has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80262?usp=email )
Change subject: riscv/mb/qemu: fix qemu invocation comment ......................................................................
riscv/mb/qemu: fix qemu invocation comment
Change-Id: I773fb39801f180fead584942dfb385fcde9d2680 Signed-off-by: Philipp Hug philipp@hug.cx Reviewed-on: https://review.coreboot.org/c/coreboot/+/80262 Reviewed-by: Arthur Heymans arthur@aheymans.xyz Reviewed-by: Maximilian Brune maximilian.brune@9elements.com Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: ron minnich rminnich@gmail.com --- M src/mainboard/emulation/qemu-riscv/Kconfig M util/qemu/Makefile.mk 2 files changed, 5 insertions(+), 2 deletions(-)
Approvals: Nico Huber: Looks good to me, but someone else must approve build bot (Jenkins): Verified ron minnich: Looks good to me, approved Arthur Heymans: Looks good to me, approved Maximilian Brune: Looks good to me, approved
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig index 091c432..d915d68 100644 --- a/src/mainboard/emulation/qemu-riscv/Kconfig +++ b/src/mainboard/emulation/qemu-riscv/Kconfig @@ -1,8 +1,7 @@ ## SPDX-License-Identifier: GPL-2.0-only
# To execute, do: -# util/riscv/make-spike-elf.sh build/coreboot.rom build/coreboot.elf -# qemu-system-riscv64 -M virt -m 1024M -nographic -kernel build/coreboot.elf +# qemu-system-riscv64 -M virt -m 1024M -nographic -bios build/coreboot.rom
if BOARD_EMULATION_QEMU_RISCV_RV64 diff --git a/util/qemu/Makefile.mk b/util/qemu/Makefile.mk index 077fde7..42441df 100644 --- a/util/qemu/Makefile.mk +++ b/util/qemu/Makefile.mk @@ -29,6 +29,10 @@ QEMU-$(CONFIG_BOARD_EMULATION_QEMU_AARCH64) ?= qemu-system-aarch64 \ -M virt,secure=on,virtualization=on -cpu cortex-a53 -m 1G
+QEMU-$(CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64) ?= qemu-system-riscv64 -M virt + +QEMU-$(CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32) ?= qemu-system-riscv32 -M virt + QEMU-$(CONFIG_BOARD_EMULATION_QEMU_X86_I440FX) ?= qemu-system-x86_64 -M pc
QEMU-$(CONFIG_BOARD_EMULATION_QEMU_X86_Q35) ?= qemu-system-x86_64 -M q35