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>
This commit is contained in:
parent
2c918a245c
commit
fe6ac447ad
|
@ -163,11 +163,10 @@ static void armv7m_reset(void *opaque)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Init CPU and memory for a v7-M based board.
|
/* Init CPU and memory for a v7-M based board.
|
||||||
flash_size and sram_size are in kb.
|
mem_size is in bytes.
|
||||||
Returns the NVIC array. */
|
Returns the NVIC array. */
|
||||||
|
|
||||||
qemu_irq *armv7m_init(MemoryRegion *system_memory,
|
qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
|
||||||
int flash_size, int sram_size,
|
|
||||||
const char *kernel_filename, const char *cpu_model)
|
const char *kernel_filename, const char *cpu_model)
|
||||||
{
|
{
|
||||||
ARMCPU *cpu;
|
ARMCPU *cpu;
|
||||||
|
@ -180,13 +179,8 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
|
||||||
uint64_t lowaddr;
|
uint64_t lowaddr;
|
||||||
int i;
|
int i;
|
||||||
int big_endian;
|
int big_endian;
|
||||||
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
|
||||||
MemoryRegion *flash = g_new(MemoryRegion, 1);
|
|
||||||
MemoryRegion *hack = g_new(MemoryRegion, 1);
|
MemoryRegion *hack = g_new(MemoryRegion, 1);
|
||||||
|
|
||||||
flash_size *= 1024;
|
|
||||||
sram_size *= 1024;
|
|
||||||
|
|
||||||
if (cpu_model == NULL) {
|
if (cpu_model == NULL) {
|
||||||
cpu_model = "cortex-m3";
|
cpu_model = "cortex-m3";
|
||||||
}
|
}
|
||||||
|
@ -197,27 +191,6 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
|
||||||
}
|
}
|
||||||
env = &cpu->env;
|
env = &cpu->env;
|
||||||
|
|
||||||
#if 0
|
|
||||||
/* > 32Mb SRAM gets complicated because it overlaps the bitband area.
|
|
||||||
We don't have proper commandline options, so allocate half of memory
|
|
||||||
as SRAM, up to a maximum of 32Mb, and the rest as code. */
|
|
||||||
if (ram_size > (512 + 32) * 1024 * 1024)
|
|
||||||
ram_size = (512 + 32) * 1024 * 1024;
|
|
||||||
sram_size = (ram_size / 2) & TARGET_PAGE_MASK;
|
|
||||||
if (sram_size > 32 * 1024 * 1024)
|
|
||||||
sram_size = 32 * 1024 * 1024;
|
|
||||||
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,
|
|
||||||
&error_abort);
|
|
||||||
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, &error_abort);
|
|
||||||
vmstate_register_ram_global(sram);
|
|
||||||
memory_region_add_subregion(system_memory, 0x20000000, sram);
|
|
||||||
armv7m_bitband_init();
|
armv7m_bitband_init();
|
||||||
|
|
||||||
nvic = qdev_create(NULL, "armv7m_nvic");
|
nvic = qdev_create(NULL, "armv7m_nvic");
|
||||||
|
@ -244,7 +217,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
|
||||||
image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
|
image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
|
||||||
NULL, big_endian, ELF_MACHINE, 1);
|
NULL, big_endian, ELF_MACHINE, 1);
|
||||||
if (image_size < 0) {
|
if (image_size < 0) {
|
||||||
image_size = load_image_targphys(kernel_filename, 0, flash_size);
|
image_size = load_image_targphys(kernel_filename, 0, mem_size);
|
||||||
lowaddr = 0;
|
lowaddr = 0;
|
||||||
}
|
}
|
||||||
if (image_size < 0) {
|
if (image_size < 0) {
|
||||||
|
|
|
@ -1220,10 +1220,26 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
|
||||||
int i;
|
int i;
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
flash_size = ((board->dc0 & 0xffff) + 1) << 1;
|
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
||||||
sram_size = (board->dc0 >> 18) + 1;
|
MemoryRegion *flash = g_new(MemoryRegion, 1);
|
||||||
pic = armv7m_init(get_system_memory(),
|
MemoryRegion *system_memory = get_system_memory();
|
||||||
flash_size, sram_size, kernel_filename, cpu_model);
|
|
||||||
|
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,
|
||||||
|
&error_abort);
|
||||||
|
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,
|
||||||
|
&error_abort);
|
||||||
|
vmstate_register_ram_global(sram);
|
||||||
|
memory_region_add_subregion(system_memory, 0x20000000, sram);
|
||||||
|
|
||||||
|
pic = armv7m_init(system_memory, flash_size, kernel_filename, cpu_model);
|
||||||
|
|
||||||
if (board->dc1 & (1 << 16)) {
|
if (board->dc1 & (1 << 16)) {
|
||||||
dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
|
dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
|
||||||
|
|
|
@ -15,8 +15,7 @@
|
||||||
#include "hw/irq.h"
|
#include "hw/irq.h"
|
||||||
|
|
||||||
/* armv7m.c */
|
/* armv7m.c */
|
||||||
qemu_irq *armv7m_init(MemoryRegion *system_memory,
|
qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
|
||||||
int flash_size, int sram_size,
|
|
||||||
const char *kernel_filename, const char *cpu_model);
|
const char *kernel_filename, const char *cpu_model);
|
||||||
|
|
||||||
/* arm_boot.c */
|
/* arm_boot.c */
|
||||||
|
|
Loading…
Reference in a new issue