From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 24 Feb 2020 13:39:43 +0000 (-0800)
Subject: riscv: sifive_u: Update BIOS_FILENAME for 32-bit
X-Git-Tag: v5.0.0-rc0~33^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b78c3296314b5bbb5f837e9b1dee7b8dde25573b;p=thirdparty%2Fqemu.git

riscv: sifive_u: Update BIOS_FILENAME for 32-bit

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>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---

diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 156a0036429..4409ea1cccb 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -56,7 +56,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;