[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c
From: |
Ben Dooks |
Subject: |
Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c |
Date: |
Sun, 17 Apr 2022 22:38:00 +0100 |
User-agent: |
NeoMutt/20170113 (1.7.2) |
On Sat, Apr 16, 2022 at 08:30:34PM +0100, Ben Dooks wrote:
> Use the qemu_fdt_setprop_strings() in sifve_u.c to simplify
> the code.
>
> Signed-off-by; Ben Dooks <qemu@ben.fluff.org>
> ---
> hw/riscv/sifive_u.c | 20 +++++++-------------
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 1fe364cbb0..b00086d86e 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -103,13 +103,6 @@ static void create_fdt(SiFiveUState *s, const
> MemMapEntry *memmap,
> char *nodename;
> uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle = 1;
> uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle;
> - static const char * const ethclk_names[2] = { "pclk", "hclk" };
> - static const char * const clint_compat[2] = {
> - "sifive,clint0", "riscv,clint0"
> - };
> - static const char * const plic_compat[2] = {
> - "sifive,plic-1.0.0", "riscv,plic0"
> - };
>
> if (ms->dtb) {
> fdt = s->fdt = load_device_tree(ms->dtb, &s->fdt_size);
> @@ -221,8 +214,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry
> *memmap,
> nodename = g_strdup_printf("/soc/clint@%lx",
> (long)memmap[SIFIVE_U_DEV_CLINT].base);
> qemu_fdt_add_subnode(fdt, nodename);
> - qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> - (char **)&clint_compat, ARRAY_SIZE(clint_compat));
> + qemu_fdt_setprop_strings(fdt, nodename, "compatible",
> + "sifive,clint0", "riscv,clint0");
> qemu_fdt_setprop_reg64(fdt, nodename, &memmap[SIFIVE_U_DEV_CLINT]);
> qemu_fdt_setprop(fdt, nodename, "interrupts-extended",
> cells, ms->smp.cpus * sizeof(uint32_t) * 4);
> @@ -273,8 +266,10 @@ static void create_fdt(SiFiveUState *s, const
> MemMapEntry *memmap,
> (long)memmap[SIFIVE_U_DEV_PLIC].base);
> qemu_fdt_add_subnode(fdt, nodename);
> qemu_fdt_setprop_cell(fdt, nodename, "#interrupt-cells", 1);
> - qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> - (char **)&plic_compat, ARRAY_SIZE(plic_compat));
> + //qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> + // (char **)&plic_compat, ARRAY_SIZE(plic_compat));
Whoops, will fix this conversion, should have removed the original
instead of commenting it out.
--
Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.