From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fs39G-0002CX-P8
	for qemu-devel@nongnu.org; Sun, 18 Jun 2006 15:41:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fs39F-0002AL-P3
	for qemu-devel@nongnu.org; Sun, 18 Jun 2006 15:41:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fs39F-0002A2-Kh
	for qemu-devel@nongnu.org; Sun, 18 Jun 2006 15:41:29 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fs3JO-0004Xl-7p
	for qemu-devel@nongnu.org; Sun, 18 Jun 2006 15:51:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fs39F-0006bA-00
	for <qemu-devel@nongnu.org>; Sun, 18 Jun 2006 15:41:29 -0400
Received: from pbrook by savannah.gnu.org with local (Exim 4.50)
	id 1Fs39E-0006b6-Or
	for qemu-devel@nongnu.org; Sun, 18 Jun 2006 19:41:28 +0000
Message-Id: <E1Fs39E-0006b6-Or@savannah.gnu.org>
From: Paul Brook <paul@nowt.org>
Date: Sun, 18 Jun 2006 19:41:28 +0000
Subject: [Qemu-devel] qemu vl.h hw/sun4u.c
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Paul Brook <pbrook>	06/06/18 19:41:28

Modified files:
	.              : vl.h 
	hw             : sun4u.c 

Log message:
	Sun4u vga+bios tweaks (Blue Swirl).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/sun4u.c?cvsroot=qemu&r1=1.10&r2=1.11

Patches:
Index: vl.h
===================================================================
RCS file: /sources/qemu/qemu/vl.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- vl.h	14 Jun 2006 16:03:05 -0000	1.128
+++ vl.h	18 Jun 2006 19:41:28 -0000	1.129
@@ -148,7 +148,7 @@
 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)

Index: hw/sun4u.c
===================================================================
RCS file: /sources/qemu/qemu/hw/sun4u.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- hw/sun4u.c	14 Jun 2006 12:36:31 -0000	1.10
+++ hw/sun4u.c	18 Jun 2006 19:41:28 -0000	1.11
@@ -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 @@
     }
     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]) {