From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FqUbt-0001SE-RK for qemu-devel@nongnu.org; Wed, 14 Jun 2006 08:36:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FqUbq-0001P0-Ph for qemu-devel@nongnu.org; Wed, 14 Jun 2006 08:36:36 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FqUbq-0001Oq-L3 for qemu-devel@nongnu.org; Wed, 14 Jun 2006 08:36:34 -0400 Received: from [199.232.41.3] (helo=savannah.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqUl1-0002cN-4e for qemu-devel@nongnu.org; Wed, 14 Jun 2006 08:46:03 -0400 Received: from savannah.gnu.org ([127.0.0.1]) by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian)) id 1FqUbo-0005S5-00 for ; Wed, 14 Jun 2006 08:36:32 -0400 Received: from bellard by savannah.gnu.org with local (Exim 4.50) id 1FqUbo-0005Rs-Bj for qemu-devel@nongnu.org; Wed, 14 Jun 2006 12:36:32 +0000 Message-Id: From: Fabrice Bellard Date: Wed, 14 Jun 2006 12:36:32 +0000 Subject: [Qemu-devel] qemu Makefile qemu-doc.texi hw/sun4m.c hw/sun4u... Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org CVSROOT: /sources/qemu Module name: qemu Changes by: Fabrice Bellard 06/06/14 12:36:32 Modified files: . : Makefile qemu-doc.texi hw : sun4m.c sun4u.c pc-bios : README Added files: pc-bios : openbios-sparc32 Removed files: pc-bios : proll.elf Log message: use OpenBIOS instead of Proll on sparc (Blue Swirl) CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/qemu/Makefile?cvsroot=qemu&r1=1.102&r2=1.103 http://cvs.savannah.gnu.org/viewcvs/qemu/qemu-doc.texi?cvsroot=qemu&r1=1.91&r2=1.92 http://cvs.savannah.gnu.org/viewcvs/qemu/hw/sun4m.c?cvsroot=qemu&r1=1.17&r2=1.18 http://cvs.savannah.gnu.org/viewcvs/qemu/hw/sun4u.c?cvsroot=qemu&r1=1.9&r2=1.10 http://cvs.savannah.gnu.org/viewcvs/qemu/pc-bios/README?cvsroot=qemu&r1=1.7&r2=1.8 http://cvs.savannah.gnu.org/viewcvs/qemu/pc-bios/openbios-sparc32?cvsroot=qemu&rev=1.1 http://cvs.savannah.gnu.org/viewcvs/qemu/pc-bios/proll.elf?cvsroot=qemu&r1=1.5&r2=0 Patches: Index: Makefile =================================================================== RCS file: /sources/qemu/qemu/Makefile,v retrieving revision 1.102 retrieving revision 1.103 diff -u -b -r1.102 -r1.103 --- Makefile 14 May 2006 12:07:53 -0000 1.102 +++ Makefile 14 Jun 2006 12:36:31 -0000 1.103 @@ -68,7 +68,7 @@ $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" mkdir -p "$(DESTDIR)$(datadir)" for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ - video.x proll.elf linux_boot.bin; do \ + video.x openbios-sparc32 linux_boot.bin; do \ $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ done ifndef CONFIG_WIN32 @@ -149,7 +149,7 @@ $(datadir)/vgabios-cirrus.bin \ $(datadir)/ppc_rom.bin \ $(datadir)/video.x \ - $(datadir)/proll.elf \ + $(datadir)/openbios-sparc32 \ $(datadir)/linux_boot.bin \ $(docdir)/qemu-doc.html \ $(docdir)/qemu-tech.html \ Index: qemu-doc.texi =================================================================== RCS file: /sources/qemu/qemu/qemu-doc.texi,v retrieving revision 1.91 retrieving revision 1.92 diff -u -b -r1.91 -r1.92 --- qemu-doc.texi 11 Jun 2006 16:28:41 -0000 1.91 +++ qemu-doc.texi 14 Jun 2006 12:36:31 -0000 1.92 @@ -1394,7 +1394,7 @@ @node Sparc32 System emulator invocation @section Sparc32 System emulator invocation -Use the executable @file{qemu-system-sparc} to simulate a JavaStation +Use the executable @file{qemu-system-sparc} to simulate a SparcStation 5 (sun4m architecture). The emulation is somewhat complete. QEMU emulates the following sun4m peripherals: @@ -1419,13 +1419,14 @@ The number of peripherals is fixed in the architecture. -QEMU uses the Proll, a PROM replacement available at -@url{http://people.redhat.com/@/zaitcev/linux/}. The required -QEMU-specific patches are included with the sources. +Since version 0.8.1, QEMU uses OpenBIOS +@url{http://www.openbios.org/}. OpenBIOS is a free (GPL v2) portable +firmware implementation. The goal is to implement a 100% IEEE +1275-1994 (referred to as Open Firmware) compliant firmware. A sample Linux 2.6 series kernel and ram disk image are available on -the QEMU web site. Please note that currently neither Linux 2.4 -series, NetBSD, nor OpenBSD kernels work. +the QEMU web site. Please note that currently NetBSD, OpenBSD or +Solaris kernels don't work. @c man begin OPTIONS Index: hw/sun4m.c =================================================================== RCS file: /sources/qemu/qemu/hw/sun4m.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -b -r1.17 -r1.18 --- hw/sun4m.c 13 May 2006 16:11:23 -0000 1.17 +++ hw/sun4m.c 14 Jun 2006 12:36:31 -0000 1.18 @@ -28,8 +28,7 @@ #define INITRD_LOAD_ADDR 0x00800000 #define PROM_SIZE_MAX (256 * 1024) #define PROM_ADDR 0xffd00000 -#define PROM_FILENAMEB "proll.bin" -#define PROM_FILENAMEE "proll.elf" +#define PROM_FILENAME "openbios-sparc32" #define PHYS_JJ_EEPROM 0x71200000 /* m48t08 */ #define PHYS_JJ_IDPROM_OFF 0x1FD8 #define PHYS_JJ_EEPROM_SIZE 0x2000 @@ -273,13 +272,9 @@ (PROM_SIZE_MAX + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK, prom_offset | IO_MEM_ROM); - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEE); + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAME); ret = load_elf(buf, 0, NULL); if (ret < 0) { - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEB); - ret = load_image(buf, phys_ram_base + prom_offset); - } - if (ret < 0) { fprintf(stderr, "qemu: could not load prom '%s'\n", buf); exit(1); Index: hw/sun4u.c =================================================================== RCS file: /sources/qemu/qemu/hw/sun4u.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- hw/sun4u.c 13 May 2006 16:11:23 -0000 1.9 +++ hw/sun4u.c 14 Jun 2006 12:36:31 -0000 1.10 @@ -32,8 +32,7 @@ #define APB_SPECIAL_BASE 0x1fe00000000ULL #define APB_MEM_BASE 0x1ff00000000ULL #define VGA_BASE (APB_MEM_BASE + 0x400000ULL) -#define PROM_FILENAMEB "proll-sparc64.bin" -#define PROM_FILENAMEE "proll-sparc64.elf" +#define PROM_FILENAME "openbios-sparc64" #define NVRAM_SIZE 0x2000 /* TSC handling */ @@ -282,13 +281,9 @@ (PROM_SIZE_MAX + TARGET_PAGE_SIZE) & TARGET_PAGE_MASK, prom_offset | IO_MEM_ROM); - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEE); + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAME); ret = load_elf(buf, 0, NULL); if (ret < 0) { - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEB); - ret = load_image(buf, phys_ram_base + prom_offset); - } - if (ret < 0) { fprintf(stderr, "qemu: could not load prom '%s'\n", buf); exit(1); Index: pc-bios/README =================================================================== RCS file: /sources/qemu/qemu/pc-bios/README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- pc-bios/README 3 Jul 2005 16:45:23 -0000 1.7 +++ pc-bios/README 14 Jun 2006 12:36:32 -0000 1.8 @@ -7,11 +7,10 @@ - The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is available at http://perso.magic.fr/l_indien/OpenHackWare/index.htm. -- Proll is a GPL'd boot PROM for Sparc JavaStations - (http://people.redhat.com/zaitcev/linux/). - Applying proll.patch allows circumventing some bugs and enables - faster kernel load through a hack. - - video.x is a PowerMac NDRV compatible driver for a VGA frame buffer. It comes from the Mac-on-Linux project (http://www.maconlinux.org/). + +- OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable + firmware implementation. The goal is to implement a 100% IEEE + 1275-1994 (referred to as Open Firmware) compliant firmware. Index: pc-bios/openbios-sparc32 =================================================================== RCS file: pc-bios/openbios-sparc32 diff -N pc-bios/openbios-sparc32 Binary files /dev/null and /tmp/cvs8US4HG differ Index: pc-bios/proll.elf =================================================================== RCS file: pc-bios/proll.elf diff -N pc-bios/proll.elf Binary files /tmp/cvshnWuqF and /dev/null differ