On 6/2/23 15:00, Daniel Henrique Barboza wrote:
The microchip_icicle_kit, sifive_u, spike and virt boards are now doing
the same steps when '-kernel' is used:

- execute load_kernel()
- load init_rd()
- write kernel_cmdline

Let's fold everything inside riscv_load_kernel() to avoid code
repetition. To not change the behavior of boards that aren't calling
riscv_load_init(), add an 'load_initrd' flag to riscv_load_kernel() and
allow these boards to opt out from initrd loading.

Cc: Palmer Dabbelt <[email protected]>
Reviewed-by: Bin Meng <[email protected]>
Reviewed-by: Alistair Francis <[email protected]>
Signed-off-by: Daniel Henrique Barboza <[email protected]>
---
  hw/riscv/boot.c            | 11 +++++++++++
  hw/riscv/microchip_pfsoc.c | 11 +----------
  hw/riscv/opentitan.c       |  3 ++-
  hw/riscv/sifive_e.c        |  3 ++-
  hw/riscv/sifive_u.c        | 11 +----------
  hw/riscv/spike.c           | 11 +----------
  hw/riscv/virt.c            | 11 +----------
  include/hw/riscv/boot.h    |  1 +
  8 files changed, 20 insertions(+), 42 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <[email protected]>


Reply via email to