bitkeeper revision 1.1705.1.2 (42a9372fTpt-bOGdIcKsOLb8_xlJ4Q)

Remove tools/ioemu/pc-bios. We have replacements in tools/firmware
now.
Signed-off-by: Keir Fraser <keir@xensource.com>

13 files changed, 0 insertions, 311 deletions

diff --git a/.rootkeys b/.rootkeys
index a7745827e3..168f1d5bbc 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -707,17 +707,6 @@
 428d0d88lVaOC64YBZ1Wzt-WV4JaSw tools/ioemu/osdep.c
 428d0d885W7r27CDEJCW6Jlbxggc9g tools/ioemu/osdep.h
 428d0d88CiP9tVdIdLWAzOnCOSdafg tools/ioemu/path.c
-428d0d88jzHltLAzyhV1lpFckzy8CA tools/ioemu/pc-bios/Makefile
-428d0d889pv_iPNBFn6cNRzQfJMC3A tools/ioemu/pc-bios/README
-428d0d88mhWW8SQFNfp-NaH3c8QQkg tools/ioemu/pc-bios/bios.bin
-428d0d88LMSMDbTFG1-sS8LL90hExw tools/ioemu/pc-bios/bios.diff
-428d0d89SHpdZE1S-ywjJCulIWs4Ag tools/ioemu/pc-bios/linux_boot.S
-428d0d89hiL0UgU71ero86GEu1loaA tools/ioemu/pc-bios/linux_boot.bin
-428d0d894MKpOb385vcoB_s_4q0QOA tools/ioemu/pc-bios/ppc_rom.bin
-428d0d896uo6qr-ONYkpleolayT4zw tools/ioemu/pc-bios/proll.bin
-428d0d893gsF8AcCadeYXcKM-aqssA tools/ioemu/pc-bios/proll.patch
-428d0d89GgbrVx4Ov3Zg-SFX_0BRdw tools/ioemu/pc-bios/vgabios-cirrus.bin
-428d0d89h9nqxPIgDpPMXZIWkdosNw tools/ioemu/pc-bios/vgabios.bin
 428d0d8908B65zMmhdGVME3jv7gpww tools/ioemu/qemu-binfmt-conf.sh
 428d0d89taY6NPlnIyOAMQd_Ww5qUw tools/ioemu/qemu-img.c
 428d0d89FY-g4UPH-ZW7t5ZCqvQVTQ tools/ioemu/readline.c
diff --git a/tools/ioemu/Makefile b/tools/ioemu/Makefile
index 502413fc8a..d99da37ef4 100644
--- a/tools/ioemu/Makefile
+++ b/tools/ioemu/Makefile
@@ -51,23 +51,9 @@ common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
 
 install: all 
 	mkdir -p "$(bindir)"
-ifndef CONFIG_WIN32
-#	install -m 755 -s $(TOOLS) "$(bindir)"
-endif
 	mkdir -p "$(DESTDIR)/$(datadir)"
-	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
-                       pc-bios/vgabios-cirrus.bin \
-                       pc-bios/ppc_rom.bin \
-                       pc-bios/proll.bin \
-                       pc-bios/linux_boot.bin "$(DESTDIR)/$(datadir)"
-	#mkdir -p "$(DESTDIR)/$(docdir)"
-	#install -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)/$(docdir)"
-ifndef CONFIG_WIN32
-	#mkdir -p "$(DESTDIR)/$(mandir)/man1"
-	#install qemu.1 qemu-mkcow.1 "$(DESTDIR)/$(mandir)/man1"
 	mkdir -p "$(DESTDIR)/$(datadir)/keymaps"
 	install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(DESTDIR)/$(datadir)/keymaps"
-endif
 	for d in $(TARGET_DIRS); do \
 	$(MAKE) -C $$d $@ || exit 1 ; \
         done
@@ -105,14 +91,6 @@ tarbin:
         $(DESTDIR)/$(bindir)/qemu-arm \
         $(DESTDIR)/$(bindir)/qemu-sparc \
         $(DESTDIR)/$(bindir)/qemu-ppc \
-	$(DESTDIR)/$(datadir)/bios.bin \
-	$(DESTDIR)/$(datadir)/vgabios.bin \
-	$(DESTDIR)/$(datadir)/vgabios-cirrus.bin \
-	$(DESTDIR)/$(datadir)/ppc_rom.bin \
-	$(DESTDIR)/$(datadir)/proll.bin \
-	$(DESTDIR)/$(datadir)/linux_boot.bin \
-	$(DESTDIR)/$(docdir)/qemu-doc.html \
-	$(DESTDIR)/$(docdir)/qemu-tech.html \
 	$(DESTDIR)/$(mandir)/man1/qemu.1 $(DESTDIR)/$(mandir)/man1/qemu-mkcow.1 )
 
 ifneq ($(wildcard .depend),)
diff --git a/tools/ioemu/pc-bios/Makefile b/tools/ioemu/pc-bios/Makefile
deleted file mode 100644
index 7ae0ff02a0..0000000000
--- a/tools/ioemu/pc-bios/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# NOTE: only compilable with x86 cross compile tools
-#
-include ../config-host.mak
-
-DEFINES=
-
-TARGETS=
-ifeq ($(ARCH),i386)
-TARGETS+=linux_boot.bin
-endif
-
-all: $(TARGETS)
-
-linux_boot.bin: linux_boot.o
-	ld --oformat binary -Ttext 0 -o $@ $<
-	chmod a-x $@
-
-%.o: %.S
-	$(CC) $(DEFINES) -c -o $@ $<
-
-clean:
-	rm -f $(TARGETS) *.o *~
-
diff --git a/tools/ioemu/pc-bios/README b/tools/ioemu/pc-bios/README
deleted file mode 100644
index a10a9f0dfa..0000000000
--- a/tools/ioemu/pc-bios/README
+++ /dev/null
@@ -1,13 +0,0 @@
-- The PC BIOS comes from the Bochs project
-  (http://bochs.sourceforge.net/). A patch from bios.diff was applied.
-
-- The VGA BIOS and the Cirrus VGA BIOS come from the LGPL VGA bios
-  project (http://www.nongnu.org/vgabios/).
-
-- The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is
-  available at http://site.voila.fr/jmayer/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.
diff --git a/tools/ioemu/pc-bios/bios.bin b/tools/ioemu/pc-bios/bios.bin
deleted file mode 100644
index fe9816e0a7..0000000000
--- a/tools/ioemu/pc-bios/bios.bin
+++ /dev/null
diff --git a/tools/ioemu/pc-bios/bios.diff b/tools/ioemu/pc-bios/bios.diff
deleted file mode 100644
index 7850769642..0000000000
--- a/tools/ioemu/pc-bios/bios.diff
+++ /dev/null
@@ -1,162 +0,0 @@
-Index: rombios.c
-===================================================================
-RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
-retrieving revision 1.110
-diff -u -w -r1.110 rombios.c
---- rombios.c	31 May 2004 13:11:27 -0000	1.110
-+++ rombios.c	7 Oct 2004 21:23:50 -0000
-@@ -137,6 +137,7 @@
- #define DEBUG_INT16        0
- #define DEBUG_INT1A        0
- #define DEBUG_INT74        0
-+#define DEBUG_APM          0
- 
- #define BX_CPU           3
- #define BX_USE_PS2_MOUSE 1
-@@ -145,6 +146,7 @@
- #define BX_SUPPORT_FLOPPY 1
- #define BX_FLOPPY_ON_CNT 37   // 2 seconds
- #define BX_PCIBIOS       1
-+#define BX_APM           1
- 
- #define BX_USE_ATADRV    1
- #define BX_ELTORITO_BOOT 1
-@@ -230,17 +232,6 @@
-   out dx,ax
- MEND
- 
--MACRO HALT2
--  ;; the HALT macro is called with the line number of the HALT call.
--  ;; The line number is then sent to the PANIC_PORT, causing Bochs/Plex
--  ;; to print a BX_PANIC message.  This will normally halt the simulation
--  ;; with a message such as "BIOS panic at rombios.c, line 4091".
--  ;; However, users can choose to make panics non-fatal and continue.
--  mov dx,#PANIC_PORT2
--  mov ax,#?1
--  out dx,ax
--MEND
--
- MACRO JMP_AP
-   db 0xea
-   dw ?2
-@@ -1543,15 +1534,12 @@
-     }
- 
-   if (action & BIOS_PRINTF_HALT) {
--    // freeze in a busy loop.  If I do a HLT instruction, then in versions
--    // 1.3.pre1 and earlier, it will panic without ever updating the VGA
--    // display, so the panic message will not be visible.  By waiting
--    // forever, you are certain to see the panic message on screen.
--    // After a few more versions have passed, we can turn this back into
--    // a halt or something.
--    // do {} while (1);
-+    // freeze in a busy loop.  
- ASM_START
--    HALT2(__LINE__)
-+    cli
-+ halt2_loop:
-+    hlt
-+    jmp halt2_loop
- ASM_END
-     }
- }
-@@ -5412,8 +5400,8 @@
-         case 0x03: SET_BL( 0x06 ); break;
-         }
- 
--      DI = 0xefc7;
--      ES = 0xf000;
-+      DI = read_word(0x00, 0x1e*4); // INT vector 0x1E
-+      ES = read_word(0x00, 0x1e*4+2);
-       goto int13_success;
-       break;
- 
-@@ -6984,8 +6972,8 @@
-         }
- 
-       /* set es & di to point to 11 byte diskette param table in ROM */
--      DI = 0xefc7;
--      ES = 0xf000;
-+      DI = read_word(0x00, 0x1e*4); // INT vector 0x1E
-+      ES = read_word(0x00, 0x1e*4+2);
-       CLEAR_CF(); // success
-       /* disk status not changed upon success */
-       return;
-@@ -7880,7 +7868,7 @@
-   mov  al, #0x02
-   out  #0x0a, al   ;; clear DMA-1 channel 2 mask bit
- 
--  SET_INT_VECTOR(0x1E, #0xF000, #diskette_param_table)
-+  SET_INT_VECTOR(0x1E, #0xF000, #diskette_param_table2)
-   SET_INT_VECTOR(0x40, #0xF000, #int13_diskette)
-   SET_INT_VECTOR(0x0E, #0xF000, #int0e_handler) ;; IRQ 6
- 
-@@ -8344,6 +8332,19 @@
-   pop   ax
-   iret
- 
-+
-+;--------------------
-+#if BX_APM
-+use32 386
-+#define APM_PROT32
-+#include "apmbios.S"
-+use16 386
-+
-+#define APM_REAL
-+#include "apmbios.S"
-+
-+#endif
-+
- ;--------------------
- #if BX_PCIBIOS
- use32 386
-@@ -9515,6 +9516,26 @@
-   pop  ds
-   iret
- 
-+diskette_param_table2:
-+;;  New diskette parameter table adding 3 parameters from IBM
-+;;  Since no provisions are made for multiple drive types, most
-+;;  values in this table are ignored.  I set parameters for 1.44M
-+;;  floppy here
-+db  0xAF
-+db  0x02 ;; head load time 0000001, DMA used
-+db  0x25
-+db  0x02
-+db    18
-+db  0x1B
-+db  0xFF
-+db  0x6C
-+db  0xF6
-+db  0x0F
-+db  0x08
-+db    79 ;; maximum track
-+db     0 ;; data transfer rate
-+db     4 ;; drive type in cmos
-+
- .org 0xf045 ; INT 10 Functions 0-Fh Entry Point
-   HALT(__LINE__)
-   iret
-@@ -9560,6 +9581,10 @@
- .org 0xf859 ; INT 15h System Services Entry Point
- int15_handler:
-   pushf
-+#if BX_APM
-+  cmp ah, #0x53
-+  je apm_call
-+#endif
-   push  ds
-   push  es
-   pushad
-@@ -9570,6 +9595,10 @@
-   popf
-   //JMPL(iret_modify_cf)
-   jmp iret_modify_cf
-+#if BX_APM
-+apm_call:
-+  jmp _apmreal_entry
-+#endif
- 
- ;; Protected mode IDT descriptor
- ;;
diff --git a/tools/ioemu/pc-bios/linux_boot.S b/tools/ioemu/pc-bios/linux_boot.S
deleted file mode 100644
index 22fcd4be80..0000000000
--- a/tools/ioemu/pc-bios/linux_boot.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * QEMU Boot sector to launch a preloaded Linux kernel
- * Copyright (c) 2004 Fabrice Bellard
- */
-
-#define LOAD_SEG 0x9000
-        
-.code16	
-.text
-	.globl	_start
-
-_start:
-        cli
-        cld
-        mov $LOAD_SEG, %ax
-        mov %ax, %ds
-        mov %ax, %es
-        mov %ax, %fs
-        mov %ax, %gs
-        mov %ax, %ss
-        mov $0x8ffe, %sp
-        ljmp $LOAD_SEG + 0x20, $0
-
-1:              
-        .fill 510 - (1b - _start), 1, 0
-
-        /* boot sector signature */
-        .byte 0x55
-        .byte 0xaa
diff --git a/tools/ioemu/pc-bios/linux_boot.bin b/tools/ioemu/pc-bios/linux_boot.bin
deleted file mode 100644
index 80f7b5fee1..0000000000
--- a/tools/ioemu/pc-bios/linux_boot.bin
+++ /dev/null
diff --git a/tools/ioemu/pc-bios/ppc_rom.bin b/tools/ioemu/pc-bios/ppc_rom.bin
deleted file mode 100644
index d882dee3e3..0000000000
--- a/tools/ioemu/pc-bios/ppc_rom.bin
+++ /dev/null
diff --git a/tools/ioemu/pc-bios/proll.bin b/tools/ioemu/pc-bios/proll.bin
deleted file mode 100644
index 0489cc245f..0000000000
--- a/tools/ioemu/pc-bios/proll.bin
+++ /dev/null
diff --git a/tools/ioemu/pc-bios/proll.patch b/tools/ioemu/pc-bios/proll.patch
deleted file mode 100644
index b0860e26f4..0000000000
--- a/tools/ioemu/pc-bios/proll.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru proll_18.orig/mrcoffee/main.c proll_18/mrcoffee/main.c
---- proll_18.orig/mrcoffee/main.c	2002-09-13 16:16:59.000000000 +0200
-+++ proll_18/mrcoffee/main.c	2004-09-26 11:52:23.000000000 +0200
-@@ -101,6 +101,7 @@
- 	le_probe();
- 	init_net();
- 
-+#ifdef ORIG
- #if 0 /* RARP */
- 	if (rarp() != 0) fatal();
- 	/* printrarp(); */
-@@ -117,13 +118,20 @@
- 	xtoa(myipaddr, fname, 8);
- 	if (load(boot_rec.bp_siaddr, fname) != 0) fatal();
- #endif
-+#endif
- 
- 	romvec = init_openprom(bb.nbanks, bb.bankv, hiphybas);
- 
- 	printk("Memory used: virt 0x%x:0x%x[%dK] iomap 0x%x:0x%x\n",
- 	    PROLBASE, (int)cmem.curp, ((unsigned) cmem.curp - PROLBASE)/1024,
- 	    (int)cio.start, (int)cio.curp);
-+#ifdef ORIG
- 	set_timeout(5);  while (!chk_timeout()) { }  /* P3: let me read */
-+#else
-+	printk("loading kernel:");
-+	i = ld_bypass(0x20000000);
-+	printk(" done, size %d\n", i);
-+#endif
- 
- 	{
- 		void (*entry)(void *, int) = (void (*)(void*, int)) LOADBASE;
-diff -ru proll_18.orig/mrcoffee/openprom.c proll_18/mrcoffee/openprom.c
---- proll_18.orig/mrcoffee/openprom.c	2002-09-13 16:17:03.000000000 +0200
-+++ proll_18/mrcoffee/openprom.c	2004-09-21 21:27:16.000000000 +0200
-@@ -144,10 +144,14 @@
- };
- 
- static int cpu_nctx = NCTX_SWIFT;
-+static int cpu_cache_line_size = 0x20;
-+static int cpu_cache_nlines = 0x200;
- static struct property propv_cpu[] = {
- 	{"name",	"STP1012PGA", sizeof("STP1012PGA") },
- 	{"device_type",	"cpu", 4 },
- 	{"mmu-nctx",	(char*)&cpu_nctx, sizeof(int)},
-+	{"cache-line-size",	(char*)&cpu_cache_line_size, sizeof(int)},
-+	{"cache-nlines",	(char*)&cpu_cache_nlines, sizeof(int)},
- 	{NULL, NULL, -1}
- };
- 
diff --git a/tools/ioemu/pc-bios/vgabios-cirrus.bin b/tools/ioemu/pc-bios/vgabios-cirrus.bin
deleted file mode 100644
index 4e3c829545..0000000000
--- a/tools/ioemu/pc-bios/vgabios-cirrus.bin
+++ /dev/null
diff --git a/tools/ioemu/pc-bios/vgabios.bin b/tools/ioemu/pc-bios/vgabios.bin
deleted file mode 100644
index ed31b12b13..0000000000
--- a/tools/ioemu/pc-bios/vgabios.bin
+++ /dev/null