qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Bin Meng <bmeng.cn@gmail.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"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
Subject: [PATCH v2 3/4] riscv: sifive_u: Update BIOS_FILENAME for 32-bit
Date: Mon, 24 Feb 2020 05:39:43 -0800	[thread overview]
Message-ID: <1582551584-20093-4-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1582551584-20093-1-git-send-email-bmeng.cn@gmail.com>

Update BIOS_FILENAME to consider 32-bit bios image file name.

Tested booting Linux v5.5 32-bit image (built from rv32_defconfig
plus CONFIG_SOC_SIFIVE) with the default 32-bit bios image.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---

Changes in v2: None

 hw/riscv/sifive_u.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index ca561d3..371133e 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -57,7 +57,11 @@
 
 #include <libfdt.h>
 
-#define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin"
+#if defined(TARGET_RISCV32)
+# define BIOS_FILENAME "opensbi-riscv32-sifive_u-fw_jump.bin"
+#else
+# define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin"
+#endif
 
 static const struct MemmapEntry {
     hwaddr base;
-- 
2.7.4



  parent reply	other threads:[~2020-02-24 13:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-24 13:39 [PATCH v2 0/4] riscv: Upgrade OpenSBI to v0.6 and add 32-bit sifive_u bios image Bin Meng
2020-02-24 13:39 ` [PATCH v2 1/4] roms: opensbi: Upgrade from v0.5 to v0.6 Bin Meng
2020-02-24 16:58   ` Alistair Francis
2020-02-24 13:39 ` [PATCH v2 2/4] roms: opensbi: Add 32-bit firmware image for sifive_u machine Bin Meng
2020-02-24 18:33   ` Alistair Francis
2020-02-24 13:39 ` Bin Meng [this message]
2020-02-24 13:39 ` [PATCH v2 4/4] gitlab-ci.yml: Add jobs to build OpenSBI firmware binaries Bin Meng
2020-02-24 19:15   ` Alistair Francis
2020-03-06  0:02   ` Palmer Dabbelt
2020-03-01  2:47 ` [PATCH v2 0/4] riscv: Upgrade OpenSBI to v0.6 and add 32-bit sifive_u bios image Bin Meng
2020-03-06  0:06 ` Palmer Dabbelt

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=1582551584-20093-4-git-send-email-bmeng.cn@gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=Alistair.Francis@wdc.com \
    --cc=kbastian@mail.uni-paderborn.de \
    --cc=palmerdabbelt@google.com \
    --cc=philmd@redhat.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).