diff options
| author | Bin Meng | 2022-04-21 07:56:28 +0200 |
|---|---|---|
| committer | Alistair Francis | 2022-04-29 02:47:45 +0200 |
| commit | 6d3b9c024ce4e115f4dc24706d4c45bdc04ba093 (patch) | |
| tree | 12c2d45e01f1d12403e070088c44ef901a4b3eb1 /hw | |
| parent | Merge tag 'pull-target-arm-20220428' of https://git.linaro.org/people/pmaydel... (diff) | |
| download | qemu-6d3b9c024ce4e115f4dc24706d4c45bdc04ba093.tar.gz qemu-6d3b9c024ce4e115f4dc24706d4c45bdc04ba093.tar.xz qemu-6d3b9c024ce4e115f4dc24706d4c45bdc04ba093.zip | |
hw/riscv: spike: Add '/chosen/stdout-path' in device tree unconditionally
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>
Message-Id: <20220421055629.1177285-1-bmeng.cn@gmail.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/riscv/spike.c | 5 |
1 files 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"); } } |