Sun4u vga+bios tweaks (Blue Swirl).

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1994 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 22ab4e1d72b7b8a3c5afc57015c5978bf9886e80..6d413691dbfea57d35c14f33db45ff165beaa41c 100644 (file)
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -27,7 +27,7 @@
 #define KERNEL_LOAD_ADDR     0x00404000
 #define CMDLINE_ADDR         0x003ff000
 #define INITRD_LOAD_ADDR     0x00300000
-#define PROM_SIZE_MAX        (256 * 1024)
+#define PROM_SIZE_MAX        (512 * 1024)
 #define PROM_ADDR           0x1fff0000000ULL
 #define APB_SPECIAL_BASE     0x1fe00000000ULL
 #define APB_MEM_BASE        0x1ff00000000ULL
@@ -326,10 +326,7 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
     }
     pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, NULL);
     isa_mem_base = VGA_BASE;
-    vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, 
-                   vga_ram_size, 0, 0);
-    cpu_register_physical_memory(VGA_BASE, vga_ram_size, ram_size);
-    //pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size, ram_size, vga_ram_size);
+    pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size, ram_size, vga_ram_size);
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {

diff --git a/vl.h b/vl.h
index d2010f1ee3abf59bf5894deea40fa43c4c0c7f1b..3312451579ba5ef2a97ccc5866bc237776bf49be 100644 (file)
--- a/vl.h
+++ b/vl.h
@@ -148,7 +148,7 @@ extern int usb_enabled;
 extern int smp_cpus;
 
 /* XXX: make it dynamic */
-#if defined (TARGET_PPC)
+#if defined (TARGET_PPC) || defined (TARGET_SPARC64)
 #define BIOS_SIZE ((512 + 32) * 1024)
 #elif defined(TARGET_MIPS)
 #define BIOS_SIZE (128 * 1024)