diff options
| author | Avi Kivity <avi@redhat.com> | 2011-07-25 14:14:31 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-09-04 17:46:50 +0300 |
| commit | 72e4d2554d16af85b7cdf7dfff8143c40ef245f1 (patch) | |
| tree | da72635d65a03c0d8608540c2fdb7ee0ac76c95b /hw/an5206.c | |
| parent | fcdf7729beb53f20ab1bbcc96517f03c83cfa274 (diff) | |
| download | qemu-72e4d2554d16af85b7cdf7dfff8143c40ef245f1.zip qemu-72e4d2554d16af85b7cdf7dfff8143c40ef245f1.tar.gz qemu-72e4d2554d16af85b7cdf7dfff8143c40ef245f1.tar.bz2 | |
an5206: convert to memory API
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/an5206.c')
| -rw-r--r-- | hw/an5206.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/an5206.c b/hw/an5206.c index 04ca420..481ae60 100644 --- a/hw/an5206.c +++ b/hw/an5206.c @@ -12,6 +12,7 @@ #include "boards.h" #include "loader.h" #include "elf.h" +#include "exec-memory.h" #define KERNEL_LOAD_ADDR 0x10000 #define AN5206_MBAR_ADDR 0x10000000 @@ -37,6 +38,9 @@ static void an5206_init(ram_addr_t ram_size, int kernel_size; uint64_t elf_entry; target_phys_addr_t entry; + MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *ram = g_new(MemoryRegion, 1); + MemoryRegion *sram = g_new(MemoryRegion, 1); if (!cpu_model) cpu_model = "m5206"; @@ -52,12 +56,12 @@ static void an5206_init(ram_addr_t ram_size, env->rambar0 = AN5206_RAMBAR_ADDR | 1; /* DRAM at address zero */ - cpu_register_physical_memory(0, ram_size, - qemu_ram_alloc(NULL, "an5206.ram", ram_size) | IO_MEM_RAM); + memory_region_init_ram(ram, NULL, "an5206.ram", ram_size); + memory_region_add_subregion(address_space_mem, 0, ram); /* Internal SRAM. */ - cpu_register_physical_memory(AN5206_RAMBAR_ADDR, 512, - qemu_ram_alloc(NULL, "an5206.sram", 512) | IO_MEM_RAM); + memory_region_init_ram(sram, NULL, "an5206.sram", 512); + memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sram); mcf5206_init(AN5206_MBAR_ADDR, env); |