1d5bfde1b9
Commit 0b183fc871:"memory: move mem_path handling to memory_region_allocate_system_memory" split memory_region_init_ram and memory_region_init_ram_from_file. Also it moved mem-path handling a step up from memory_region_init_ram to memory_region_allocate_system_memory. Therefore for any board that uses memory_region_init_ram directly, -mem-path is not supported. Fix this by replacing memory_region_init_ram with memory_region_allocate_system_memory. Signed-off-by: Dirk Mueller <dmueller@suse.com> Message-Id: <CAL5wTH6X-GsT1AA8kEtP_e7oZWGZgi=fCcDfSs3wLgJN30DbUw@mail.gmail.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
104 lines
2.8 KiB
C
104 lines
2.8 KiB
C
/*
|
|
* Arnewsh 5206 ColdFire system emulation.
|
|
*
|
|
* Copyright (c) 2007 CodeSourcery.
|
|
*
|
|
* This code is licensed under the GPL
|
|
*/
|
|
|
|
#include "hw/hw.h"
|
|
#include "hw/m68k/mcf.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/loader.h"
|
|
#include "elf.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "sysemu/qtest.h"
|
|
|
|
#define KERNEL_LOAD_ADDR 0x10000
|
|
#define AN5206_MBAR_ADDR 0x10000000
|
|
#define AN5206_RAMBAR_ADDR 0x20000000
|
|
|
|
/* Board init. */
|
|
|
|
static void an5206_init(MachineState *machine)
|
|
{
|
|
ram_addr_t ram_size = machine->ram_size;
|
|
const char *cpu_model = machine->cpu_model;
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
M68kCPU *cpu;
|
|
CPUM68KState *env;
|
|
int kernel_size;
|
|
uint64_t elf_entry;
|
|
hwaddr entry;
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
|
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
|
|
|
if (!cpu_model) {
|
|
cpu_model = "m5206";
|
|
}
|
|
cpu = cpu_m68k_init(cpu_model);
|
|
if (!cpu) {
|
|
hw_error("Unable to find m68k CPU definition\n");
|
|
}
|
|
env = &cpu->env;
|
|
|
|
/* Initialize CPU registers. */
|
|
env->vbr = 0;
|
|
/* TODO: allow changing MBAR and RAMBAR. */
|
|
env->mbar = AN5206_MBAR_ADDR | 1;
|
|
env->rambar0 = AN5206_RAMBAR_ADDR | 1;
|
|
|
|
/* DRAM at address zero */
|
|
memory_region_allocate_system_memory(ram, NULL, "an5206.ram", ram_size);
|
|
memory_region_add_subregion(address_space_mem, 0, ram);
|
|
|
|
/* Internal SRAM. */
|
|
memory_region_init_ram(sram, NULL, "an5206.sram", 512, &error_abort);
|
|
vmstate_register_ram_global(sram);
|
|
memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sram);
|
|
|
|
mcf5206_init(address_space_mem, AN5206_MBAR_ADDR, cpu);
|
|
|
|
/* Load kernel. */
|
|
if (!kernel_filename) {
|
|
if (qtest_enabled()) {
|
|
return;
|
|
}
|
|
fprintf(stderr, "Kernel image must be specified\n");
|
|
exit(1);
|
|
}
|
|
|
|
kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
|
|
NULL, NULL, 1, ELF_MACHINE, 0);
|
|
entry = elf_entry;
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL,
|
|
NULL, NULL);
|
|
}
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
|
|
ram_size - KERNEL_LOAD_ADDR);
|
|
entry = KERNEL_LOAD_ADDR;
|
|
}
|
|
if (kernel_size < 0) {
|
|
fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
|
|
exit(1);
|
|
}
|
|
|
|
env->pc = entry;
|
|
}
|
|
|
|
static QEMUMachine an5206_machine = {
|
|
.name = "an5206",
|
|
.desc = "Arnewsh 5206",
|
|
.init = an5206_init,
|
|
};
|
|
|
|
static void an5206_machine_init(void)
|
|
{
|
|
qemu_register_machine(&an5206_machine);
|
|
}
|
|
|
|
machine_init(an5206_machine_init);
|