Commit 5b8a9863 authored by Anup Patel's avatar Anup Patel Committed by Alistair Francis
Browse files

hw/riscv/spike: Allow loading firmware separately using -bios option 



This patch extends Spike machine support to allow loading OpenSBI
firmware (fw_jump.elf) separately using -bios option.

Signed-off-by: default avatarAnup Patel <anup.patel@wdc.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20200427080644.168461-3-anup.patel@wdc.com
Message-Id: <20200427080644.168461-3-anup.patel@wdc.com>
Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
parent 02777ac3

hw/riscv/spike.c

+23 −1
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ 


#include <libfdt.h>



#if defined(TARGET_RISCV32)

# define BIOS_FILENAME "opensbi-riscv32-spike-fw_jump.elf"

#else

# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf"

#endif



static const struct MemmapEntry {

    hwaddr base;

    hwaddr size;
@@ -187,8 +193,24 @@ static void spike_board_init(MachineState *machine) 
    memory_region_add_subregion(system_memory, memmap[SPIKE_MROM].base,

                                mask_rom);



    riscv_find_and_load_firmware(machine, BIOS_FILENAME,

                                 memmap[SPIKE_DRAM].base,

                                 htif_symbol_callback);



    if (machine->kernel_filename) {

        riscv_load_kernel(machine->kernel_filename, htif_symbol_callback);

        uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename,

                                                  htif_symbol_callback);



        if (machine->initrd_filename) {

            hwaddr start;

            hwaddr end = riscv_load_initrd(machine->initrd_filename,

                                           machine->ram_size, kernel_entry,

                                           &start);

            qemu_fdt_setprop_cell(s->fdt, "/chosen",

                                  "linux,initrd-start", start);

            qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end",

                                  end);

        }

    }



    /* reset vector */