diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-07-02 15:20:29 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-07-02 15:20:29 +0000 |
| commit | 0699b548399936ed24b110e3e1f82cc80adbdfd9 (patch) | |
| tree | 683d9d05252206436bce0a8420e5923248fdcb7d /hw | |
| parent | 9d1d106a3d95ada648703e871975897c1cf05383 (diff) | |
| download | qemu-0699b548399936ed24b110e3e1f82cc80adbdfd9.zip qemu-0699b548399936ed24b110e3e1f82cc80adbdfd9.tar.gz qemu-0699b548399936ed24b110e3e1f82cc80adbdfd9.tar.bz2 | |
init cleanup (Ralf Baechle)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1472 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mips_r4k.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 27f6365..1deda14 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -285,22 +285,19 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, initrd_base = 0; initrd_size = 0; } - /* XXX: should not be ! */ - printf("%s: init VGA\n", __func__); - vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size, - vga_ram_size); - /* Init internal devices */ cpu_mips_clock_init(cpu_single_env); cpu_mips_irqctrl_init(); - isa_mem_base = 0x78000000; - /* Register 64 KB of ISA IO space at random address */ + /* Register 64 KB of ISA IO space at 0x14000000 */ io_memory = cpu_register_io_memory(0, io_read, io_write, NULL); - cpu_register_physical_memory(0x70000000, 0x00010000, io_memory); + cpu_register_physical_memory(0x14000000, 0x00010000, io_memory); + isa_mem_base = 0x10000000; + serial_init(0x3f8, 4, serial_hds[0]); - printf("%s: done\n", __func__); + vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size, + vga_ram_size); } QEMUMachine mips_machine = { |