[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/25] hw/riscv: spike: Add '/chosen/stdout-path' in device tree u
From: |
Alistair Francis |
Subject: |
[PULL 01/25] hw/riscv: spike: Add '/chosen/stdout-path' in device tree unconditionally |
Date: |
Fri, 29 Apr 2022 14:30:55 +1000 |
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>
Message-Id: <20220421055629.1177285-1-bmeng.cn@gmail.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
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.35.1
- [PULL 00/25] riscv-to-apply queue, Alistair Francis, 2022/04/29
- [PULL 02/25] hw/riscv: Don't add empty bootargs to device tree, Alistair Francis, 2022/04/29
- [PULL 01/25] hw/riscv: spike: Add '/chosen/stdout-path' in device tree unconditionally,
Alistair Francis <=
- [PULL 03/25] target/riscv: Support configuarable marchid, mvendorid, mipid CSR values, Alistair Francis, 2022/04/29
- [PULL 04/25] target/riscv: rvk: add cfg properties for zbk* and zk*, Alistair Francis, 2022/04/29
- [PULL 05/25] target/riscv: rvk: add support for zbkb extension, Alistair Francis, 2022/04/29
- [PULL 06/25] target/riscv: rvk: add support for zbkc extension, Alistair Francis, 2022/04/29
- [PULL 07/25] target/riscv: rvk: add support for zbkx extension, Alistair Francis, 2022/04/29
- [PULL 08/25] crypto: move sm4_sbox from target/arm, Alistair Francis, 2022/04/29
- [PULL 09/25] target/riscv: rvk: add support for zknd/zkne extension in RV32, Alistair Francis, 2022/04/29
- [PULL 10/25] target/riscv: rvk: add support for zkne/zknd extension in RV64, Alistair Francis, 2022/04/29
- [PULL 11/25] target/riscv: rvk: add support for sha256 related instructions in zknh extension, Alistair Francis, 2022/04/29
- [PULL 12/25] target/riscv: rvk: add support for sha512 related instructions for RV32 in zknh extension, Alistair Francis, 2022/04/29