Message ID | 1565510821-3927-25-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | riscv: sifive_u: Improve the emulation fidelity of sifive_u machine | expand |
On Sun, Aug 11, 2019 at 1:17 AM Bin Meng <bmeng.cn@gmail.com> wrote: > > The loading of initramfs is currently not supported on 'sifive_u'. > Add the support to make '-initrd' command line parameter useful. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Chih-Min Chao <chihmin.chao@sifive.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > > Changes in v3: None > Changes in v2: None > > hw/riscv/sifive_u.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index e8bef44..b0026aa 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -328,7 +328,18 @@ static void riscv_sifive_u_init(MachineState *machine) > memmap[SIFIVE_U_DRAM].base); > > if (machine->kernel_filename) { > - riscv_load_kernel(machine->kernel_filename); > + uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename); > + > + 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 */ > -- > 2.7.4 > >
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index e8bef44..b0026aa 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -328,7 +328,18 @@ static void riscv_sifive_u_init(MachineState *machine) memmap[SIFIVE_U_DRAM].base); if (machine->kernel_filename) { - riscv_load_kernel(machine->kernel_filename); + uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename); + + 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 */