| Message ID | 983ec72e6da807c6297e1bf12a8cc6ec02223c9e.1526081108.git.alistair.francis@wdc.com |
|---|---|
| State | New |
| Headers | show |
| Series | RISC-V: SoCify SiFive boards and connect GEM | expand |
On Sat, May 12, 2018 at 11:28 AM, Alistair Francis <alistair.francis@wdc.com > wrote: > Set the interrupt-controller ndev to the correct number taken from the > HiFive Unleashed board. > > Signed-off-by: Alistair Francis <alistair.francis@wdc.com> > If you look at hw/riscv/virt.c we have removed hardcoding a few more constants using in the device tree. e.g. we allocate and resolve phandles vs hardcoding them. We can alwauys make a follow up commits to move some of these magic numbers into constants in the headers, preferably with enum vs #define. Reviewed-by: Michael Clark <mjc@sifive.com> --- > hw/riscv/sifive_u.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 859f43c6f9..50389cdc90 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -187,7 +187,7 @@ static void create_fdt(SiFiveUState *s, const struct > MemmapEntry *memmap, > 0x0, memmap[SIFIVE_U_PLIC].size); > qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); > qemu_fdt_setprop_cell(fdt, nodename, "riscv,max-priority", 7); > - qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", 4); > + qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", 0x35); > qemu_fdt_setprop_cells(fdt, nodename, "phandle", 2); > qemu_fdt_setprop_cells(fdt, nodename, "linux,phandle", 2); > plic_phandle = qemu_fdt_get_phandle(fdt, nodename); > -- > 2.17.0 > >
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 859f43c6f9..50389cdc90 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -187,7 +187,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, 0x0, memmap[SIFIVE_U_PLIC].size); qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); qemu_fdt_setprop_cell(fdt, nodename, "riscv,max-priority", 7); - qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", 4); + qemu_fdt_setprop_cell(fdt, nodename, "riscv,ndev", 0x35); qemu_fdt_setprop_cells(fdt, nodename, "phandle", 2); qemu_fdt_setprop_cells(fdt, nodename, "linux,phandle", 2); plic_phandle = qemu_fdt_get_phandle(fdt, nodename);
Set the interrupt-controller ndev to the correct number taken from the HiFive Unleashed board. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)