diff options
| author | Avi Kivity <avi@redhat.com> | 2011-07-25 14:32:34 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-08-25 10:56:12 +0300 |
| commit | 5461eb211197ec5957cd9c6c7fe39f038535dcf3 (patch) | |
| tree | 3fffbc0c689274096de91dccc6e55485fb70602c /hw | |
| parent | fbe15adf8ed7c3ec41ff44fadabafb3175eb88cc (diff) | |
| download | qemu-5461eb211197ec5957cd9c6c7fe39f038535dcf3.tar.gz qemu-5461eb211197ec5957cd9c6c7fe39f038535dcf3.tar.bz2 qemu-5461eb211197ec5957cd9c6c7fe39f038535dcf3.zip | |
axis_dev88: convert to memory API (RAM only)
Reviewed-by: Richard Henderson <rth@twiddle.net>
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/axis_dev88.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 06200e257a..73eb39d43b 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -31,6 +31,7 @@ #include "elf.h" #include "cris-boot.h" #include "blockdev.h" +#include "exec-memory.h" #define D(x) #define DNAND(x) @@ -259,8 +260,9 @@ void axisdev88_init (ram_addr_t ram_size, int i; int nand_regs; int gpio_regs; - ram_addr_t phys_ram; - ram_addr_t phys_intmem; + MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *phys_ram = g_new(MemoryRegion, 1); + MemoryRegion *phys_intmem = g_new(MemoryRegion, 1); /* init CPUs */ if (cpu_model == NULL) { @@ -269,15 +271,13 @@ void axisdev88_init (ram_addr_t ram_size, env = cpu_init(cpu_model); /* allocate RAM */ - phys_ram = qemu_ram_alloc(NULL, "axisdev88.ram", ram_size); - cpu_register_physical_memory(0x40000000, ram_size, phys_ram | IO_MEM_RAM); + memory_region_init_ram(phys_ram, NULL, "axisdev88.ram", ram_size); + memory_region_add_subregion(address_space_mem, 0x40000000, phys_ram); /* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the internal memory. */ - phys_intmem = qemu_ram_alloc(NULL, "axisdev88.chipram", INTMEM_SIZE); - cpu_register_physical_memory(0x38000000, INTMEM_SIZE, - phys_intmem | IO_MEM_RAM); - + memory_region_init_ram(phys_intmem, NULL, "axisdev88.chipram", INTMEM_SIZE); + memory_region_add_subregion(address_space_mem, 0x38000000, phys_intmem); /* Attach a NAND flash to CS1. */ nand = drive_get(IF_MTD, 0, 0); |