include/hw/riscv/tt_atlantis.h | 4 ++++
hw/riscv/tt_atlantis.c | 15 ++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/include/hw/riscv/tt_atlantis.h b/include/hw/riscv/tt_atlantis.h
index 2ec283d0fd7b..9ca98bfb8478 100644
--- a/include/hw/riscv/tt_atlantis.h
+++ b/include/hw/riscv/tt_atlantis.h
@@ -31,10 +31,14 @@ struct TTAtlantisState {
MemoryRegion *memory;
MemoryRegion *dram;
+ MemoryRegion ram_hi;
+ MemoryRegion ram_lo;
+
RISCVHartArrayState cpus;
DeviceState *irqchip;
DesignWareI2CState i2c[TT_ATL_NUM_I2C];
UnimplementedDeviceState uart1;
+ MemoryRegion bootrom;
};
enum {
diff --git a/hw/riscv/tt_atlantis.c b/hw/riscv/tt_atlantis.c
index 7a9f5872c7c0..b80bdf54c40b 100644
--- a/hw/riscv/tt_atlantis.c
+++ b/hw/riscv/tt_atlantis.c
@@ -483,9 +483,6 @@ static void tt_atlantis_machine_init(MachineState *machine)
{
TTAtlantisState *s = TT_ATLANTIS_MACHINE(machine);
- MemoryRegion *ram_hi = g_new(MemoryRegion, 1);
- MemoryRegion *ram_lo = g_new(MemoryRegion, 1);
- MemoryRegion *bootrom = g_new(MemoryRegion, 1);
ram_addr_t lo_ram_size, ram_size;
int hart_count = machine->smp.cpus;
@@ -543,22 +540,22 @@ static void tt_atlantis_machine_init(MachineState *machine)
exit(EXIT_FAILURE);
}
- memory_region_init_alias(ram_hi, OBJECT(machine), "ram.high", s->dram,
+ memory_region_init_alias(&s->ram_hi, OBJECT(machine), "ram.high", s->dram,
0, ram_size);
memory_region_add_subregion(s->memory,
- s->memmap[TT_ATL_DDR_HI].base, ram_hi);
+ s->memmap[TT_ATL_DDR_HI].base, &s->ram_hi);
lo_ram_size = MIN(ram_size, s->memmap[TT_ATL_DDR_LO].size);
- memory_region_init_alias(ram_lo, OBJECT(machine), "ram.low", s->dram,
+ memory_region_init_alias(&s->ram_lo, OBJECT(machine), "ram.low", s->dram,
0, lo_ram_size);
memory_region_add_subregion(s->memory,
- s->memmap[TT_ATL_DDR_LO].base, ram_lo);
+ s->memmap[TT_ATL_DDR_LO].base, &s->ram_lo);
/* Boot ROM */
- memory_region_init_rom(bootrom, NULL, "tt-atlantis.bootrom",
+ memory_region_init_rom(&s->bootrom, NULL, "tt-atlantis.bootrom",
s->memmap[TT_ATL_BOOTROM].size, &error_fatal);
memory_region_add_subregion(s->memory, s->memmap[TT_ATL_BOOTROM].base,
- bootrom);
+ &s->bootrom);
/* UART1, the soc console (UART0 is for the boot microcontroller) */
serial_mm_init(s->memory, s->memmap[TT_ATL_UART1].base, 2,