diff options
| author | Avi Kivity <avi@redhat.com> | 2011-07-25 14:27:01 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-08-24 20:17:51 +0300 |
| commit | fbe15adf8ed7c3ec41ff44fadabafb3175eb88cc (patch) | |
| tree | 7d91ffe115c7349034751d9bad904df46d92ddeb /hw/stellaris.c | |
| parent | 4c390a1d32b59c49fbb89e73b1d21fde78e0168d (diff) | |
armv7m: convert to memory API
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/stellaris.c')
| -rw-r--r-- | hw/stellaris.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/stellaris.c b/hw/stellaris.c index 9b0db7f511..2bf1c235dc 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -15,6 +15,7 @@ #include "i2c.h" #include "net.h" #include "boards.h" +#include "exec-memory.h" #define GPIO_A 0 #define GPIO_B 1 @@ -1260,6 +1261,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, 0x40024000, 0x40025000, 0x40026000}; static const int gpio_irq[7] = {0, 1, 2, 3, 4, 30, 31}; + MemoryRegion *address_space_mem = get_system_memory(); qemu_irq *pic; DeviceState *gpio_dev[7]; qemu_irq gpio_in[7][8]; @@ -1274,7 +1276,8 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, flash_size = ((board->dc0 & 0xffff) + 1) << 1; sram_size = (board->dc0 >> 18) + 1; - pic = armv7m_init(flash_size, sram_size, kernel_filename, cpu_model); + pic = armv7m_init(address_space_mem, + flash_size, sram_size, kernel_filename, cpu_model); if (board->dc1 & (1 << 16)) { dev = sysbus_create_varargs("stellaris-adc", 0x40038000, |