Re: [PATCH 7/8] hw/riscv: Use macros for BIOS image names

[Alistair Francis]

On Mon, Mar 29, 2021 at 1:20 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> From: Bin Meng <bin.meng@windriver.com>
>
> The OpenSBI BIOS image names are used by many RISC-V machines.
> Let's define macros for them.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>
>  include/hw/riscv/boot.h | 5 +++++
>  hw/riscv/sifive_u.c     | 6 ++----
>  hw/riscv/spike.c        | 6 ++----
>  hw/riscv/virt.c         | 6 ++----
>  4 files changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h
> index 11a21dd584..0e89400b09 100644
> --- a/include/hw/riscv/boot.h
> +++ b/include/hw/riscv/boot.h
> @@ -24,6 +24,11 @@
>  #include "hw/loader.h"
>  #include "hw/riscv/riscv_hart.h"
>
> +#define RISCV32_BIOS_BIN    "opensbi-riscv32-generic-fw_dynamic.bin"
> +#define RISCV32_BIOS_ELF    "opensbi-riscv32-generic-fw_dynamic.elf"
> +#define RISCV64_BIOS_BIN    "opensbi-riscv64-generic-fw_dynamic.bin"
> +#define RISCV64_BIOS_ELF    "opensbi-riscv64-generic-fw_dynamic.elf"
> +
>  bool riscv_is_32bit(RISCVHartArrayState *harts);
>
>  target_ulong riscv_calc_kernel_start_addr(RISCVHartArrayState *harts,
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 651a439528..d484ec3483 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -557,12 +557,10 @@ static void sifive_u_machine_init(MachineState *machine)
>
>      if (riscv_is_32bit(&s->soc.u_cpus)) {
>          firmware_end_addr = riscv_find_and_load_firmware(machine,
> -                                    "opensbi-riscv32-generic-fw_dynamic.bin",
> -                                    start_addr, NULL);
> +                                    RISCV32_BIOS_BIN, start_addr, NULL);
>      } else {
>          firmware_end_addr = riscv_find_and_load_firmware(machine,
> -                                    "opensbi-riscv64-generic-fw_dynamic.bin",
> -                                    start_addr, NULL);
> +                                    RISCV64_BIOS_BIN, start_addr, NULL);
>      }
>
>      if (machine->kernel_filename) {
> diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> index cc33061f23..4f19c8acba 100644
> --- a/hw/riscv/spike.c
> +++ b/hw/riscv/spike.c
> @@ -257,13 +257,11 @@ static void spike_board_init(MachineState *machine)
>       */
>      if (riscv_is_32bit(&s->soc[0])) {
>          firmware_end_addr = riscv_find_and_load_firmware(machine,
> -                                    "opensbi-riscv32-generic-fw_dynamic.elf",
> -                                    memmap[SPIKE_DRAM].base,
> +                                    RISCV32_BIOS_ELF, 
> memmap[SPIKE_DRAM].base,
>                                      htif_symbol_callback);
>      } else {
>          firmware_end_addr = riscv_find_and_load_firmware(machine,
> -                                    "opensbi-riscv64-generic-fw_dynamic.elf",
> -                                    memmap[SPIKE_DRAM].base,
> +                                    RISCV64_BIOS_ELF, 
> memmap[SPIKE_DRAM].base,
>                                      htif_symbol_callback);
>      }
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index d04733d97c..25e845fc78 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -676,12 +676,10 @@ static void virt_machine_init(MachineState *machine)
>
>      if (riscv_is_32bit(&s->soc[0])) {
>          firmware_end_addr = riscv_find_and_load_firmware(machine,
> -                                    "opensbi-riscv32-generic-fw_dynamic.bin",
> -                                    start_addr, NULL);
> +                                    RISCV32_BIOS_BIN, start_addr, NULL);
>      } else {
>          firmware_end_addr = riscv_find_and_load_firmware(machine,
> -                                    "opensbi-riscv64-generic-fw_dynamic.bin",
> -                                    start_addr, NULL);
> +                                    RISCV64_BIOS_BIN, start_addr, NULL);
>      }
>
>      if (machine->kernel_filename) {
> --
> 2.25.1
>
>