From: Alistair Francis <alistair23@gmail.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com,
konstanty@ieee.org, martin.galvan@tallertechnologies.com
Subject: [Qemu-devel] [Patch v2 4/8] target_arm: Remove memory region init from armv7m_init
Date: Fri, 19 Sep 2014 14:54:32 +1000 [thread overview]
Message-ID: <2c11a99af5547815a5784ad91c4703ccba338af8.1411096688.git.alistair23@gmail.com> (raw)
In-Reply-To: <cover.1411096688.git.alistair23@gmail.com>
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>
---
V2:
- Change the memory region names to match the machine
hw/arm/armv7m.c | 15 +--------------
hw/arm/stellaris.c | 23 +++++++++++++++++++----
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index aedef13..5c1f7b3 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -163,7 +163,7 @@ static void armv7m_reset(void *opaque)
}
/* Init CPU and memory for a v7-M based board.
- flash_size and sram_size are in kb.
+ flash_size and sram_size are in bytes.
Returns the NVIC array. */
qemu_irq *armv7m_init(MemoryRegion *system_memory,
@@ -180,13 +180,8 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
uint64_t lowaddr;
int i;
int big_endian;
- MemoryRegion *sram = g_new(MemoryRegion, 1);
- MemoryRegion *flash = g_new(MemoryRegion, 1);
MemoryRegion *hack = g_new(MemoryRegion, 1);
- flash_size *= 1024;
- sram_size *= 1024;
-
if (cpu_model == NULL) {
cpu_model = "cortex-m3";
}
@@ -209,14 +204,6 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
code_size = ram_size - sram_size;
#endif
- /* Flash programming is done via the SCU, so pretend it is ROM. */
- memory_region_init_ram(flash, NULL, "armv7m.flash", flash_size);
- vmstate_register_ram_global(flash);
- memory_region_set_readonly(flash, true);
- memory_region_add_subregion(system_memory, 0, flash);
- memory_region_init_ram(sram, NULL, "armv7m.sram", sram_size);
- vmstate_register_ram_global(sram);
- memory_region_add_subregion(system_memory, 0x20000000, sram);
armv7m_bitband_init();
nvic = qdev_create(NULL, "armv7m_nvic");
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 64bd4b4..9738722 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -1220,10 +1220,25 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
int i;
int j;
- flash_size = ((board->dc0 & 0xffff) + 1) << 1;
- sram_size = (board->dc0 >> 18) + 1;
- pic = armv7m_init(get_system_memory(),
- flash_size, sram_size, kernel_filename, cpu_model);
+ MemoryRegion *sram = g_new(MemoryRegion, 1);
+ MemoryRegion *flash = g_new(MemoryRegion, 1);
+ MemoryRegion *system_memory = get_system_memory();
+
+ flash_size = (((board->dc0 & 0xffff) + 1) << 1) * 1024;
+ sram_size = ((board->dc0 >> 18) + 1) * 1024;
+
+ /* Flash programming is done via the SCU, so pretend it is ROM. */
+ memory_region_init_ram(flash, NULL, "stellaris.flash", flash_size);
+ vmstate_register_ram_global(flash);
+ memory_region_set_readonly(flash, true);
+ memory_region_add_subregion(system_memory, 0, flash);
+
+ memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size);
+ vmstate_register_ram_global(sram);
+ memory_region_add_subregion(system_memory, 0x20000000, sram);
+
+ pic = armv7m_init(system_memory, flash_size, sram_size,
+ kernel_filename, cpu_model);
if (board->dc1 & (1 << 16)) {
dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
--
1.9.1
next prev parent reply other threads:[~2014-09-19 4:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-19 4:54 [Qemu-devel] [Patch v2 0/8] Netduino 2 Machine Model Alistair Francis
2014-09-19 4:54 ` [Qemu-devel] [Patch v2 1/8] stm32f205_timer: Add the stm32f205 Timer Alistair Francis
2014-09-22 11:40 ` Peter Crosthwaite
2014-09-25 12:39 ` Alistair Francis
2014-09-19 4:54 ` [Qemu-devel] [Patch v2 2/8] stm32f205_USART: Add the stm32f205 USART Controller Alistair Francis
2014-09-19 4:54 ` [Qemu-devel] [Patch v2 3/8] stm32f205_SYSCFG: Add the stm32f205 SYSCFG Alistair Francis
2014-09-19 4:54 ` Alistair Francis [this message]
2014-09-22 12:11 ` [Qemu-devel] [Patch v2 4/8] target_arm: Remove memory region init from armv7m_init Peter Crosthwaite
2014-09-19 4:54 ` [Qemu-devel] [Patch v2 5/8] target_arm: Parameterise the irq lines for armv7m_init Alistair Francis
2014-09-19 4:54 ` [Qemu-devel] [Patch v2 6/8] target_arm: Change the reset values based on the ELF entry Alistair Francis
2014-09-19 4:54 ` [Qemu-devel] [Patch v2 7/8] stm32f205: Add the stm32f205 SoC Alistair Francis
2014-09-19 4:55 ` [Qemu-devel] [Patch v2 8/8] netduino2: Add the Netduino 2 Machine Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c11a99af5547815a5784ad91c4703ccba338af8.1411096688.git.alistair23@gmail.com \
--to=alistair23@gmail.com \
--cc=konstanty@ieee.org \
--cc=martin.galvan@tallertechnologies.com \
--cc=peter.crosthwaite@xilinx.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).