diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-06-18 19:41:28 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-06-18 19:41:28 +0000 |
| commit | 75956cf032c707155419729ea47179ef1bc357af (patch) | |
| tree | 9635b03fe5d1dc320f6277ae6e7689a9086279fd | |
| parent | ded3ab80dd384715dff3741e4ac8a015933cb180 (diff) | |
Sun4u vga+bios tweaks (Blue Swirl).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1994 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/sun4u.c | 7 | ||||
| -rw-r--r-- | vl.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index 22ab4e1d72..6d413691db 100644 --- 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]) { @@ -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) |