gwj / at91sam9263 · Commits

Commit 0699b548399936ed24b110e3e1f82cc80adbdfd9

Authored by bellard
1 parent 9d1d106a

init cleanup (Ralf Baechle) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1472 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 6 additions and 9 deletions
hw/mips_r4k.c
  View file @0699b54
... ... @@ -285,22 +285,19 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
285 285 initrd_base = 0;
286 286 initrd_size = 0;
287 287 }
288   - /* XXX: should not be ! */
289   - printf("%s: init VGA\n", __func__);
290   - vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size,
291   - vga_ram_size);
292   -
293 288  
294 289 /* Init internal devices */
295 290 cpu_mips_clock_init(cpu_single_env);
296 291 cpu_mips_irqctrl_init();
297 292  
298   - isa_mem_base = 0x78000000;
299   - /* Register 64 KB of ISA IO space at random address */
  293 + /* Register 64 KB of ISA IO space at 0x14000000 */
300 294 io_memory = cpu_register_io_memory(0, io_read, io_write, NULL);
301   - cpu_register_physical_memory(0x70000000, 0x00010000, io_memory);
  295 + cpu_register_physical_memory(0x14000000, 0x00010000, io_memory);
  296 + isa_mem_base = 0x10000000;
  297 +
302 298 serial_init(0x3f8, 4, serial_hds[0]);
303   - printf("%s: done\n", __func__);
  299 + vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size,
  300 + vga_ram_size);
304 301 }
305 302  
306 303 QEMUMachine mips_machine = {
... ...