3023f3329d
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
111 lines
3.1 KiB
C
111 lines
3.1 KiB
C
/*
|
|
* SHIX 2.0 board description
|
|
*
|
|
* Copyright (c) 2005 Samuel Tardieu
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
/*
|
|
Shix 2.0 board by Alexis Polti, described at
|
|
http://perso.enst.fr/~polti/realisations/shix20/
|
|
|
|
More information in target-sh4/README.sh4
|
|
*/
|
|
#include "hw.h"
|
|
#include "sh.h"
|
|
#include "sysemu.h"
|
|
#include "boards.h"
|
|
|
|
#define BIOS_FILENAME "shix_bios.bin"
|
|
#define BIOS_ADDRESS 0xA0000000
|
|
|
|
void irq_info(void)
|
|
{
|
|
/* XXXXX */
|
|
}
|
|
|
|
void pic_info(void)
|
|
{
|
|
/* XXXXX */
|
|
}
|
|
|
|
void vga_update_display(void)
|
|
{
|
|
/* XXXXX */
|
|
}
|
|
|
|
void vga_invalidate_display(void)
|
|
{
|
|
/* XXXXX */
|
|
}
|
|
|
|
void vga_screen_dump(const char *filename)
|
|
{
|
|
/* XXXXX */
|
|
}
|
|
|
|
static void shix_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)
|
|
{
|
|
int ret;
|
|
CPUState *env;
|
|
struct SH7750State *s;
|
|
|
|
if (!cpu_model)
|
|
cpu_model = "any";
|
|
|
|
printf("Initializing CPU\n");
|
|
env = cpu_init(cpu_model);
|
|
|
|
/* Allocate memory space */
|
|
printf("Allocating ROM\n");
|
|
cpu_register_physical_memory(0x00000000, 0x00004000, IO_MEM_ROM);
|
|
printf("Allocating SDRAM 1\n");
|
|
cpu_register_physical_memory(0x08000000, 0x01000000, 0x00004000);
|
|
printf("Allocating SDRAM 2\n");
|
|
cpu_register_physical_memory(0x0c000000, 0x01000000, 0x01004000);
|
|
|
|
/* Load BIOS in 0 (and access it through P2, 0xA0000000) */
|
|
if (bios_name == NULL)
|
|
bios_name = BIOS_FILENAME;
|
|
printf("%s: load BIOS '%s'\n", __func__, bios_name);
|
|
ret = load_image(bios_name, phys_ram_base);
|
|
if (ret < 0) { /* Check bios size */
|
|
fprintf(stderr, "ret=%d\n", ret);
|
|
fprintf(stderr, "qemu: could not load SHIX bios '%s'\n",
|
|
bios_name);
|
|
exit(1);
|
|
}
|
|
|
|
/* Register peripherals */
|
|
s = sh7750_init(env);
|
|
/* XXXXX Check success */
|
|
tc58128_init(s, "shix_linux_nand.bin", NULL);
|
|
fprintf(stderr, "initialization terminated\n");
|
|
}
|
|
|
|
QEMUMachine shix_machine = {
|
|
.name = "shix",
|
|
.desc = "shix card",
|
|
.init = shix_init,
|
|
.ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED,
|
|
};
|