gwj / at91sam9263 · Commits

Commit 75956cf032c707155419729ea47179ef1bc357af

Authored by pbrook
1 parent ded3ab80

Sun4u vga+bios tweaks (Blue Swirl). 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1994 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 3 additions and 6 deletions
hw/sun4u.c
  View file @75956cf
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 #define KERNEL_LOAD_ADDR 0x00404000 27 #define KERNEL_LOAD_ADDR 0x00404000
28 #define CMDLINE_ADDR 0x003ff000 28 #define CMDLINE_ADDR 0x003ff000
29 #define INITRD_LOAD_ADDR 0x00300000 29 #define INITRD_LOAD_ADDR 0x00300000
30 -#define PROM_SIZE_MAX (256 * 1024) 30 +#define PROM_SIZE_MAX (512 * 1024)
31 #define PROM_ADDR 0x1fff0000000ULL 31 #define PROM_ADDR 0x1fff0000000ULL
32 #define APB_SPECIAL_BASE 0x1fe00000000ULL 32 #define APB_SPECIAL_BASE 0x1fe00000000ULL
33 #define APB_MEM_BASE 0x1ff00000000ULL 33 #define APB_MEM_BASE 0x1ff00000000ULL
@@ -326,10 +326,7 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device, @@ -326,10 +326,7 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
326 } 326 }
327 pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, NULL); 327 pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, NULL);
328 isa_mem_base = VGA_BASE; 328 isa_mem_base = VGA_BASE;
329 - vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size,  
330 - vga_ram_size, 0, 0);  
331 - cpu_register_physical_memory(VGA_BASE, vga_ram_size, ram_size);  
332 - //pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size, ram_size, vga_ram_size); 329 + pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size, ram_size, vga_ram_size);
333 330
334 for(i = 0; i < MAX_SERIAL_PORTS; i++) { 331 for(i = 0; i < MAX_SERIAL_PORTS; i++) {
335 if (serial_hds[i]) { 332 if (serial_hds[i]) {
@@ -148,7 +148,7 @@ extern int usb_enabled; @@ -148,7 +148,7 @@ extern int usb_enabled;
148 extern int smp_cpus; 148 extern int smp_cpus;
149 149
150 /* XXX: make it dynamic */ 150 /* XXX: make it dynamic */
151 -#if defined (TARGET_PPC) 151 +#if defined (TARGET_PPC) || defined (TARGET_SPARC64)
152 #define BIOS_SIZE ((512 + 32) * 1024) 152 #define BIOS_SIZE ((512 + 32) * 1024)
153 #elif defined(TARGET_MIPS) 153 #elif defined(TARGET_MIPS)
154 #define BIOS_SIZE (128 * 1024) 154 #define BIOS_SIZE (128 * 1024)