Patch 5/7 This patch changes the graphical_console_init function to return an allocated DisplayState instead of a QEMUConsole. This patch contains just the graphical_console_init change and few other modifications mainly in console.c and vl.c. It was necessary to move the display frontends (e.g. sdl and vnc) initialization after machine->init in vl.c. This patch does *not* include any required changes to any device, these changes come with the following patches. Patch 6/7 This patch changes the QEMUMachine init functions not to take a DisplayState as an argument because is not needed any more; In few places the graphic hardware initialization function was called only if DisplayState was not NULL, now they are always called. Apart from these cases, the rest are all mechanical substitutions. Patch 7/7 This patch updates the graphic device code to use the new graphical_console_init function. As for the previous patch, in few places graphical_console_init was called only if DisplayState was not NULL, now it is always called. Apart from these cases, the rest are all mechanical substitutions. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6344 c046a42c-6fe2-441c-8c8c-71466251a162
92 lines
2.2 KiB
C
92 lines
2.2 KiB
C
/*
|
|
* Arnewsh 5206 ColdFire system emulation.
|
|
*
|
|
* Copyright (c) 2007 CodeSourcery.
|
|
*
|
|
* This code is licenced under the GPL
|
|
*/
|
|
|
|
#include "hw.h"
|
|
#include "mcf.h"
|
|
#include "sysemu.h"
|
|
#include "boards.h"
|
|
|
|
#define KERNEL_LOAD_ADDR 0x10000
|
|
#define AN5206_MBAR_ADDR 0x10000000
|
|
#define AN5206_RAMBAR_ADDR 0x20000000
|
|
|
|
/* Stub functions for hardware that doesn't exist. */
|
|
void pic_info(void)
|
|
{
|
|
}
|
|
|
|
void irq_info(void)
|
|
{
|
|
}
|
|
|
|
/* Board init. */
|
|
|
|
static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
|
|
const char *boot_device,
|
|
const char *kernel_filename, const char *kernel_cmdline,
|
|
const char *initrd_filename, const char *cpu_model)
|
|
{
|
|
CPUState *env;
|
|
int kernel_size;
|
|
uint64_t elf_entry;
|
|
target_ulong entry;
|
|
|
|
if (!cpu_model)
|
|
cpu_model = "m5206";
|
|
env = cpu_init(cpu_model);
|
|
if (!env) {
|
|
cpu_abort(env, "Unable to find m68k CPU definition\n");
|
|
}
|
|
|
|
/* 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 */
|
|
cpu_register_physical_memory(0, ram_size,
|
|
qemu_ram_alloc(ram_size) | IO_MEM_RAM);
|
|
|
|
/* Internal SRAM. */
|
|
cpu_register_physical_memory(AN5206_RAMBAR_ADDR, 512,
|
|
qemu_ram_alloc(512) | IO_MEM_RAM);
|
|
|
|
mcf5206_init(AN5206_MBAR_ADDR, env);
|
|
|
|
/* Load kernel. */
|
|
if (!kernel_filename) {
|
|
fprintf(stderr, "Kernel image must be specified\n");
|
|
exit(1);
|
|
}
|
|
|
|
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
|
|
entry = elf_entry;
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
|
|
}
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_image(kernel_filename,
|
|
phys_ram_base + 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;
|
|
}
|
|
|
|
QEMUMachine an5206_machine = {
|
|
.name = "an5206",
|
|
.desc = "Arnewsh 5206",
|
|
.init = an5206_init,
|
|
.ram_require = 512,
|
|
};
|