aboutsummaryrefslogtreecommitdiff
path: root/hw/mainstone.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-08-08 21:08:45 +0300
committerAvi Kivity <avi@redhat.com>2011-08-25 10:56:34 +0300
commit09730e296bcb0fe1471200c5c04681b644f439bd (patch)
tree54630c580070c495da5710cd40d68f3041f6abe9 /hw/mainstone.c
parent4c9e975d646f1633093e10a27da6cf655a6d9dcf (diff)
downloadqemu-09730e296bcb0fe1471200c5c04681b644f439bd.zip
qemu-09730e296bcb0fe1471200c5c04681b644f439bd.tar.gz
qemu-09730e296bcb0fe1471200c5c04681b644f439bd.tar.bz2
mainstone: convert to memory API
Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/mainstone.c')
-rw-r--r--hw/mainstone.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 78af41b..82e9571 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -17,6 +17,7 @@
#include "flash.h"
#include "blockdev.h"
#include "sysbus.h"
+#include "exec-memory.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
@@ -90,7 +91,8 @@ static struct arm_boot_info mainstone_binfo = {
.ram_size = 0x04000000,
};
-static void mainstone_common_init(ram_addr_t ram_size,
+static void mainstone_common_init(MemoryRegion *address_space_mem,
+ ram_addr_t ram_size,
const char *kernel_filename,
const char *kernel_cmdline, const char *initrd_filename,
const char *cpu_model, enum mainstone_model_e model, int arm_id)
@@ -101,6 +103,7 @@ static void mainstone_common_init(ram_addr_t ram_size,
DeviceState *mst_irq;
DriveInfo *dinfo;
int i;
+ MemoryRegion *rom = g_new(MemoryRegion, 1);
MemoryRegion *flashes = g_new(MemoryRegion, 2);
const MemoryRegionOps *flash_ops;
@@ -109,9 +112,9 @@ static void mainstone_common_init(ram_addr_t ram_size,
/* Setup CPU & memory */
cpu = pxa270_init(mainstone_binfo.ram_size, cpu_model);
- cpu_register_physical_memory(0, MAINSTONE_ROM,
- qemu_ram_alloc(NULL, "mainstone.rom",
- MAINSTONE_ROM) | IO_MEM_ROM);
+ memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM);
+ memory_region_set_readonly(rom, true);
+ memory_region_add_subregion(address_space_mem, 0, rom);
#ifdef TARGET_WORDS_BIGENDIAN
flash_ops = &pflash_cfi01_ops_be;
@@ -172,7 +175,7 @@ static void mainstone_init(ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
- mainstone_common_init(ram_size, kernel_filename,
+ mainstone_common_init(get_system_memory(), ram_size, kernel_filename,
kernel_cmdline, initrd_filename, cpu_model, mainstone, 0x196);
}