From: Bin Meng <bin.meng@windriver.com>

To keep sync with other RISC-V machines, change the default bios to
use generic platform 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 v1)

 hw/riscv/spike.c                            |   9 +++++++--
 pc-bios/opensbi-riscv32-generic-fw_jump.elf | Bin 0 -> 554156 bytes
 pc-bios/opensbi-riscv64-generic-fw_jump.elf | Bin 0 -> 619960 bytes
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 pc-bios/opensbi-riscv32-generic-fw_jump.elf
 create mode 100644 pc-bios/opensbi-riscv64-generic-fw_jump.elf

diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 3c87e04..2fb7f98 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -45,10 +45,15 @@
 
 #include <libfdt.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_jump.elf"
 #else
-# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf"
+# define BIOS_FILENAME "opensbi-riscv64-generic-fw_jump.elf"
 #endif
 
 static const struct MemmapEntry {
diff --git a/pc-bios/opensbi-riscv32-generic-fw_jump.elf b/pc-bios/opensbi-riscv32-generic-fw_jump.elf
new file mode 100644
index 0000000..5fd3fb7
Binary files /dev/null and b/pc-bios/opensbi-riscv32-generic-fw_jump.elf differ
diff --git a/pc-bios/opensbi-riscv64-generic-fw_jump.elf b/pc-bios/opensbi-riscv64-generic-fw_jump.elf
new file mode 100644
index 0000000..d29e4f8
Binary files /dev/null and b/pc-bios/opensbi-riscv64-generic-fw_jump.elf differ
-- 
2.7.4