mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
armv7m: convert to memory API
Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
4c390a1d32
commit
fbe15adf8e
3 changed files with 20 additions and 12 deletions
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue