david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

an5206: convert to memory API

Browse Source 
Reviewed-by: Richard Henderson  <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-07-25 14:14:31 +03:00
parent fcdf7729be
commit 72e4d2554d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/an5206.c
View File

@ -12,6 +12,7 @@
#include "boards.h" #include "boards.h"
#include "loader.h" #include "loader.h"
#include "elf.h" #include "elf.h"
#include "exec-memory.h"
#define KERNEL_LOAD_ADDR 0x10000 #define KERNEL_LOAD_ADDR 0x10000
#define AN5206_MBAR_ADDR 0x10000000 #define AN5206_MBAR_ADDR 0x10000000
@ -37,6 +38,9 @@ static void an5206_init(ram_addr_t ram_size,
int kernel_size; int kernel_size;
uint64_t elf_entry; uint64_t elf_entry;
target_phys_addr_t entry; target_phys_addr_t entry;
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *sram = g_new(MemoryRegion, 1);
if (!cpu_model) if (!cpu_model)
cpu_model = "m5206"; cpu_model = "m5206";
@ -52,12 +56,12 @@ static void an5206_init(ram_addr_t ram_size,
env->rambar0 = AN5206_RAMBAR_ADDR | 1; env->rambar0 = AN5206_RAMBAR_ADDR | 1;
/* DRAM at address zero */ /* DRAM at address zero */
cpu_register_physical_memory(0, ram_size, memory_region_init_ram(ram, NULL, "an5206.ram", ram_size);
qemu_ram_alloc(NULL, "an5206.ram", ram_size) | IO_MEM_RAM); memory_region_add_subregion(address_space_mem, 0, ram);
/* Internal SRAM. */ /* Internal SRAM. */
cpu_register_physical_memory(AN5206_RAMBAR_ADDR, 512, memory_region_init_ram(sram, NULL, "an5206.sram", 512);
qemu_ram_alloc(NULL, "an5206.sram", 512) | IO_MEM_RAM); memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sram);
mcf5206_init(AN5206_MBAR_ADDR, env); mcf5206_init(AN5206_MBAR_ADDR, env);