From: Bin Meng <bmeng.cn@gmail.com>
To: Alistair Francis <Alistair.Francis@wdc.com>,
Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
Palmer Dabbelt <palmerdabbelt@google.com>,
Sagar Karandikar <sagark@eecs.berkeley.edu>,
qemu-devel@nongnu.org, qemu-riscv@nongnu.org
Cc: Anup Patel <anup@brainfault.org>, Bin Meng <bin.meng@windriver.com>
Subject: [PATCH v5 5/7] hw/riscv: spike: Change the default bios to use generic platform image
Date: Wed, 15 Jul 2020 22:56:09 -0700 [thread overview]
Message-ID: <1594878971-26050-6-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com>
From: Bin Meng <bin.meng@windriver.com>
To keep sync with other RISC-V machines, change the default bios to
use generic platform fw_dynamic.elf image.
While we are here, add some comments to mention that using ELF files
for the Spike machine was intentional.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
(no changes since v3)
Changes in v3:
- Change to fw_dynamic.elf for Spike
hw/riscv/spike.c | 9 +++++++--
pc-bios/opensbi-riscv32-generic-fw_dynamic.elf | Bin 0 -> 558668 bytes
pc-bios/opensbi-riscv64-generic-fw_dynamic.elf | Bin 0 -> 620424 bytes
3 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 7b23a29..13958bd 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -42,10 +42,15 @@
#include "sysemu/qtest.h"
#include "sysemu/sysemu.h"
+/*
+ * Not like other RISC-V machines that use plain binary bios images,
+ * keeping ELF files here was intentional because BIN files don't work
+ * for the Spike machine as HTIF emulation depends on ELF parsing.
+ */
#if defined(TARGET_RISCV32)
-# define BIOS_FILENAME "opensbi-riscv32-spike-fw_jump.elf"
+# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.elf"
#else
-# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf"
+# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.elf"
#endif
static const struct MemmapEntry {
diff --git a/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf b/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
new file mode 100644
index 0000000..eb9ebf5
Binary files /dev/null and b/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf differ
diff --git a/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf b/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
new file mode 100644
index 0000000..642a64e
Binary files /dev/null and b/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf differ
--
2.7.4
next prev parent reply other threads:[~2020-07-16 5:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 5:56 [PATCH v5 0/7] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
2020-07-16 5:56 ` [PATCH v5 1/7] configure: Create symbolic links for pc-bios/*.elf files Bin Meng
2020-07-16 5:56 ` [PATCH v5 2/7] roms/opensbi: Upgrade from v0.7 to v0.8 Bin Meng
2020-07-16 5:56 ` [PATCH v5 3/7] roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware Bin Meng
2020-07-16 5:56 ` [PATCH v5 4/7] hw/riscv: Use pre-built bios image of generic platform for virt & sifive_u Bin Meng
2020-07-16 5:56 ` Bin Meng [this message]
2020-07-16 5:56 ` [PATCH v5 6/7] gitlab-ci/opensbi: Update GitLab CI to build generic platform Bin Meng
2020-07-16 5:56 ` [PATCH v5 7/7] Makefile: Ship the generic platform bios ELF images for RISC-V Bin Meng
2020-07-28 15:27 ` Alistair Francis
2020-07-28 15:51 ` Bin Meng
2020-07-28 18:17 ` Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1594878971-26050-6-git-send-email-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=Alistair.Francis@wdc.com \
--cc=anup@brainfault.org \
--cc=bin.meng@windriver.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=palmerdabbelt@google.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).