diff options
| -rw-r--r-- | hw/ppc_prep.c | 17 | ||||
| -rw-r--r-- | hw/sun4m.c | 14 |
2 files changed, 23 insertions, 8 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 06951e542d..849635f6ca 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -510,10 +510,10 @@ extern CPUPPCState *global_env; #define NVRAM_SIZE 0x2000 /* PowerPC PREP hardware initialisation */ -void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, - DisplayState *ds, const char **fd_filename, int snapshot, - const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename) +static void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, + DisplayState *ds, const char **fd_filename, int snapshot, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename) { char buf[1024]; m48t59_t *nvram; @@ -650,4 +650,13 @@ void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, /* XXX: need an option to load a NVRAM image */ 0, graphic_width, graphic_height, graphic_depth); + + /* Special port to get debug messages from Open-Firmware */ + register_ioport_write(0x0F00, 4, 1, &PPC_debug_write, NULL); } + +QEMUMachine prep_machine = { + "prep", + "PowerPC PREP platform", + ppc_prep_init, +}; diff --git a/hw/sun4m.c b/hw/sun4m.c index b911ba234a..397ade4cbf 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -203,10 +203,10 @@ uint32_t iommu_translate(uint32_t addr) } /* Sun4m hardware initialisation */ -void sun4m_init(int ram_size, int vga_ram_size, int boot_device, - DisplayState *ds, const char **fd_filename, int snapshot, - const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename) +static void sun4m_init(int ram_size, int vga_ram_size, int boot_device, + DisplayState *ds, const char **fd_filename, int snapshot, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename) { char buf[1024]; int ret, linux_boot; @@ -283,3 +283,9 @@ void sun4m_init(int ram_size, int vga_ram_size, int boot_device, } nvram_init(nvram, (uint8_t *)&nd_table[0].macaddr, kernel_cmdline, boot_device, ram_size, kernel_size, graphic_width, graphic_height, graphic_depth); } + +QEMUMachine sun4m_machine = { + "sun4m", + "Sun4m platform", + sun4m_init, +}; |