| Message ID | 20220421055629.1177285-1-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] hw/riscv: spike: Add '/chosen/stdout-path' in device tree unconditionally | expand |
On Thu, Apr 21, 2022 at 3:57 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > From: Bin Meng <bin.meng@windriver.com> > > At present the adding '/chosen/stdout-path' property in device tree > is determined by whether a kernel command line is provided, which is > wrong. It should be added unconditionally. > > Fixes: 8d8897accb1c ("hw/riscv: spike: Allow using binary firmware as bios") > Signed-off-by: Bin Meng <bin.meng@windriver.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > > hw/riscv/spike.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c > index d059a67f9b..1562b000bb 100644 > --- a/hw/riscv/spike.c > +++ b/hw/riscv/spike.c > @@ -174,10 +174,11 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, > > riscv_socket_fdt_write_distance_matrix(mc, fdt); > > + qemu_fdt_add_subnode(fdt, "/chosen"); > + qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", "/htif"); > + > if (cmdline) { > - qemu_fdt_add_subnode(fdt, "/chosen"); > qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > - qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", "/htif"); > } > } > > -- > 2.25.1 > >
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index d059a67f9b..1562b000bb 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -174,10 +174,11 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, riscv_socket_fdt_write_distance_matrix(mc, fdt); + qemu_fdt_add_subnode(fdt, "/chosen"); + qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", "/htif"); + if (cmdline) { - qemu_fdt_add_subnode(fdt, "/chosen"); qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); - qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", "/htif"); } }