| Message ID | 1520568765-58189-5-git-send-email-mjc@sifive.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/09/2018 05:12 AM, Michael Clark wrote: > Another case of replaceing hard coded constants, this time > referring to the definition in the virt machine's memmap. > > Cc: Sagar Karandikar <sagark@eecs.berkeley.edu> > Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> > Signed-off-by: Michael Clark <mjc@sifive.com> > Signed-off-by: Palmer Dabbelt <palmer@sifive.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/riscv/virt.c | 4 ++-- > include/hw/riscv/virt.h | 2 -- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 0055439..0d101fc 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -338,11 +338,11 @@ static void riscv_virt_board_init(MachineState *machine) > }; > > /* copy in the reset vector */ > - copy_le32_to_phys(ROM_BASE, reset_vec, sizeof(reset_vec)); > + copy_le32_to_phys(memmap[VIRT_MROM].base, reset_vec, sizeof(reset_vec)); > > /* copy in the device tree */ > qemu_fdt_dumpdtb(s->fdt, s->fdt_size); > - cpu_physical_memory_write(ROM_BASE + sizeof(reset_vec), > + cpu_physical_memory_write(memmap[VIRT_MROM].base + sizeof(reset_vec), > s->fdt, s->fdt_size); > > /* create PLIC hart topology configuration string */ > diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h > index 2fbe808..655e85d 100644 > --- a/include/hw/riscv/virt.h > +++ b/include/hw/riscv/virt.h > @@ -23,8 +23,6 @@ > #define VIRT(obj) \ > OBJECT_CHECK(RISCVVirtState, (obj), TYPE_RISCV_VIRT_BOARD) > > -enum { ROM_BASE = 0x1000 }; > - > typedef struct { > /*< private >*/ > SysBusDevice parent_obj; >
On 03/08/2018 10:12 PM, Michael Clark wrote: > Another case of replaceing hard coded constants, this time s/replaceing/replacing/ > referring to the definition in the virt machine's memmap. > > Cc: Sagar Karandikar <sagark@eecs.berkeley.edu> > Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> > Signed-off-by: Michael Clark <mjc@sifive.com> > Signed-off-by: Palmer Dabbelt <palmer@sifive.com> > ---
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 0055439..0d101fc 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -338,11 +338,11 @@ static void riscv_virt_board_init(MachineState *machine) }; /* copy in the reset vector */ - copy_le32_to_phys(ROM_BASE, reset_vec, sizeof(reset_vec)); + copy_le32_to_phys(memmap[VIRT_MROM].base, reset_vec, sizeof(reset_vec)); /* copy in the device tree */ qemu_fdt_dumpdtb(s->fdt, s->fdt_size); - cpu_physical_memory_write(ROM_BASE + sizeof(reset_vec), + cpu_physical_memory_write(memmap[VIRT_MROM].base + sizeof(reset_vec), s->fdt, s->fdt_size); /* create PLIC hart topology configuration string */ diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 2fbe808..655e85d 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -23,8 +23,6 @@ #define VIRT(obj) \ OBJECT_CHECK(RISCVVirtState, (obj), TYPE_RISCV_VIRT_BOARD) -enum { ROM_BASE = 0x1000 }; - typedef struct { /*< private >*/ SysBusDevice parent_obj;