Message ID | 1569044491-7875-2-git-send-email-bmeng.cn@gmail.com |
---|---|
State | New |
Headers | show |
Series | [v2,1/2] riscv: hw: Drop "clock-frequency" property of cpu nodes | expand |
On 9/21/19 7:41 AM, Bin Meng wrote: > U-Boot expects this alias to be in place in order to fix up the mac > address of the ethernet node. > > This is to keep in sync with Linux kernel commit below: > https://patchwork.kernel.org/patch/11133033/ > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > > Changes in v2: None > > hw/riscv/sifive_u.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 02dd761..1ac51e3 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -270,6 +270,10 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, > s->soc.gem.conf.macaddr.a, ETH_ALEN); > qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1); > qemu_fdt_setprop_cell(fdt, nodename, "#size-cells", 0); > + > + qemu_fdt_add_subnode(fdt, "/aliases"); > + qemu_fdt_setprop_string(fdt, "/aliases", "ethernet0", nodename); > + > g_free(nodename); > > nodename = g_strdup_printf("/soc/ethernet@%lx/ethernet-phy@0", > @@ -297,7 +301,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, > qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > } > > - qemu_fdt_add_subnode(fdt, "/aliases"); > qemu_fdt_setprop_string(fdt, "/aliases", "serial0", nodename); > > g_free(nodename); >
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 02dd761..1ac51e3 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -270,6 +270,10 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, s->soc.gem.conf.macaddr.a, ETH_ALEN); qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1); qemu_fdt_setprop_cell(fdt, nodename, "#size-cells", 0); + + qemu_fdt_add_subnode(fdt, "/aliases"); + qemu_fdt_setprop_string(fdt, "/aliases", "ethernet0", nodename); + g_free(nodename); nodename = g_strdup_printf("/soc/ethernet@%lx/ethernet-phy@0", @@ -297,7 +301,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); } - qemu_fdt_add_subnode(fdt, "/aliases"); qemu_fdt_setprop_string(fdt, "/aliases", "serial0", nodename); g_free(nodename);