Unverified Commit 7c28f4da authored May 22, 2018 by Michael Clark Committed by Palmer Dabbelt Oct 17, 2018

RISC-V: Don't add NULL bootargs to device-tree



Signed-off-by: Michael Clark <mjc@sifive.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>

parent b6aa6ced

hw/riscv/sifive_u.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,9 @@ static void create_fdt(SiFiveUState s, const struct MemmapEntry memmap,

		qemu_fdt_add_subnode(fdt, "/chosen");
		qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename);
		if (cmdline) {
		qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
		}
		g_free(nodename);
		}

hw/riscv/spike.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -156,9 +156,11 @@ static void create_fdt(SpikeState s, const struct MemmapEntry memmap,
		g_free(cells);
		g_free(nodename);

		if (cmdline) {
		qemu_fdt_add_subnode(fdt, "/chosen");
		qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
		}
		}

		static void spike_v1_10_0_board_init(MachineState *machine)
		{

hw/riscv/virt.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,9 @@ static void create_fdt(RISCVVirtState s, const struct MemmapEntry *memmap,

		qemu_fdt_add_subnode(fdt, "/chosen");
		qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename);
		if (cmdline) {
		qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
		}
		g_free(nodename);

		return fdt;