aboutsummaryrefslogtreecommitdiff
path: root/include/hw/arm
diff options
context:
space:
mode:
authorAlistair Francis <alistair23@gmail.com>2015-02-05 13:37:21 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-02-05 13:37:21 +0000
commitfe6ac447add80978c1bf988c3ef4a7ce8aab2fa0 (patch)
treee6fc125a5890099157226aefbd41a89fe8314fc5 /include/hw/arm
parent2c918a245ca2a0b3339b8ded926b3f887d6d409e (diff)
target_arm: Remove memory region init from armv7m_init
This patch moves the memory region init code from the armv7m_init function to the stellaris_init function Signed-off-by: Alistair Francis <alistair23@gmail.com> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Message-id: 4836be7e1d708554d6eb0bc639dc2fbf7dac0458.1422077994.git.alistair23@gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/arm')
-rw-r--r--include/hw/arm/arm.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h
index c4bf56d44f..f8b329bb3a 100644
--- a/include/hw/arm/arm.h
+++ b/include/hw/arm/arm.h
@@ -15,8 +15,7 @@
#include "hw/irq.h"
/* armv7m.c */
-qemu_irq *armv7m_init(MemoryRegion *system_memory,
- int flash_size, int sram_size,
+qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
const char *kernel_filename, const char *cpu_model);
/* arm_boot.c */