direct-io.hg

changeset 5412:9525c272f5c5

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>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jun 10 06:46:07 2005 +0000 (2005-06-10)
parents 77b8f9a2ca79
children 3185b74f6f7e
files .rootkeys tools/ioemu/Makefile tools/ioemu/pc-bios/Makefile tools/ioemu/pc-bios/README tools/ioemu/pc-bios/bios.bin tools/ioemu/pc-bios/bios.diff tools/ioemu/pc-bios/linux_boot.S tools/ioemu/pc-bios/linux_boot.bin tools/ioemu/pc-bios/ppc_rom.bin tools/ioemu/pc-bios/proll.bin tools/ioemu/pc-bios/proll.patch tools/ioemu/pc-bios/vgabios-cirrus.bin tools/ioemu/pc-bios/vgabios.bin
line diff
     1.1 --- a/.rootkeys	Fri Jun 10 01:58:26 2005 +0000
     1.2 +++ b/.rootkeys	Fri Jun 10 06:46:07 2005 +0000
     1.3 @@ -707,17 +707,6 @@ 428d0d88Fcan7gQZ6axXOmokBDLe7g tools/ioe
     1.4  428d0d88lVaOC64YBZ1Wzt-WV4JaSw tools/ioemu/osdep.c
     1.5  428d0d885W7r27CDEJCW6Jlbxggc9g tools/ioemu/osdep.h
     1.6  428d0d88CiP9tVdIdLWAzOnCOSdafg tools/ioemu/path.c
     1.7 -428d0d88jzHltLAzyhV1lpFckzy8CA tools/ioemu/pc-bios/Makefile
     1.8 -428d0d889pv_iPNBFn6cNRzQfJMC3A tools/ioemu/pc-bios/README
     1.9 -428d0d88mhWW8SQFNfp-NaH3c8QQkg tools/ioemu/pc-bios/bios.bin
    1.10 -428d0d88LMSMDbTFG1-sS8LL90hExw tools/ioemu/pc-bios/bios.diff
    1.11 -428d0d89SHpdZE1S-ywjJCulIWs4Ag tools/ioemu/pc-bios/linux_boot.S
    1.12 -428d0d89hiL0UgU71ero86GEu1loaA tools/ioemu/pc-bios/linux_boot.bin
    1.13 -428d0d894MKpOb385vcoB_s_4q0QOA tools/ioemu/pc-bios/ppc_rom.bin
    1.14 -428d0d896uo6qr-ONYkpleolayT4zw tools/ioemu/pc-bios/proll.bin
    1.15 -428d0d893gsF8AcCadeYXcKM-aqssA tools/ioemu/pc-bios/proll.patch
    1.16 -428d0d89GgbrVx4Ov3Zg-SFX_0BRdw tools/ioemu/pc-bios/vgabios-cirrus.bin
    1.17 -428d0d89h9nqxPIgDpPMXZIWkdosNw tools/ioemu/pc-bios/vgabios.bin
    1.18  428d0d8908B65zMmhdGVME3jv7gpww tools/ioemu/qemu-binfmt-conf.sh
    1.19  428d0d89taY6NPlnIyOAMQd_Ww5qUw tools/ioemu/qemu-img.c
    1.20  428d0d89FY-g4UPH-ZW7t5ZCqvQVTQ tools/ioemu/readline.c
     2.1 --- a/tools/ioemu/Makefile	Fri Jun 10 01:58:26 2005 +0000
     2.2 +++ b/tools/ioemu/Makefile	Fri Jun 10 06:46:07 2005 +0000
     2.3 @@ -51,23 +51,9 @@ common  de-ch  es     fo  fr-ca  hu     
     2.4  
     2.5  install: all 
     2.6  	mkdir -p "$(bindir)"
     2.7 -ifndef CONFIG_WIN32
     2.8 -#	install -m 755 -s $(TOOLS) "$(bindir)"
     2.9 -endif
    2.10  	mkdir -p "$(DESTDIR)/$(datadir)"
    2.11 -	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
    2.12 -                       pc-bios/vgabios-cirrus.bin \
    2.13 -                       pc-bios/ppc_rom.bin \
    2.14 -                       pc-bios/proll.bin \
    2.15 -                       pc-bios/linux_boot.bin "$(DESTDIR)/$(datadir)"
    2.16 -	#mkdir -p "$(DESTDIR)/$(docdir)"
    2.17 -	#install -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)/$(docdir)"
    2.18 -ifndef CONFIG_WIN32
    2.19 -	#mkdir -p "$(DESTDIR)/$(mandir)/man1"
    2.20 -	#install qemu.1 qemu-mkcow.1 "$(DESTDIR)/$(mandir)/man1"
    2.21  	mkdir -p "$(DESTDIR)/$(datadir)/keymaps"
    2.22  	install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(DESTDIR)/$(datadir)/keymaps"
    2.23 -endif
    2.24  	for d in $(TARGET_DIRS); do \
    2.25  	$(MAKE) -C $$d $@ || exit 1 ; \
    2.26          done
    2.27 @@ -105,14 +91,6 @@ tarbin:
    2.28          $(DESTDIR)/$(bindir)/qemu-arm \
    2.29          $(DESTDIR)/$(bindir)/qemu-sparc \
    2.30          $(DESTDIR)/$(bindir)/qemu-ppc \
    2.31 -	$(DESTDIR)/$(datadir)/bios.bin \
    2.32 -	$(DESTDIR)/$(datadir)/vgabios.bin \
    2.33 -	$(DESTDIR)/$(datadir)/vgabios-cirrus.bin \
    2.34 -	$(DESTDIR)/$(datadir)/ppc_rom.bin \
    2.35 -	$(DESTDIR)/$(datadir)/proll.bin \
    2.36 -	$(DESTDIR)/$(datadir)/linux_boot.bin \
    2.37 -	$(DESTDIR)/$(docdir)/qemu-doc.html \
    2.38 -	$(DESTDIR)/$(docdir)/qemu-tech.html \
    2.39  	$(DESTDIR)/$(mandir)/man1/qemu.1 $(DESTDIR)/$(mandir)/man1/qemu-mkcow.1 )
    2.40  
    2.41  ifneq ($(wildcard .depend),)
     3.1 --- a/tools/ioemu/pc-bios/Makefile	Fri Jun 10 01:58:26 2005 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,24 +0,0 @@
     3.4 -#
     3.5 -# NOTE: only compilable with x86 cross compile tools
     3.6 -#
     3.7 -include ../config-host.mak
     3.8 -
     3.9 -DEFINES=
    3.10 -
    3.11 -TARGETS=
    3.12 -ifeq ($(ARCH),i386)
    3.13 -TARGETS+=linux_boot.bin
    3.14 -endif
    3.15 -
    3.16 -all: $(TARGETS)
    3.17 -
    3.18 -linux_boot.bin: linux_boot.o
    3.19 -	ld --oformat binary -Ttext 0 -o $@ $<
    3.20 -	chmod a-x $@
    3.21 -
    3.22 -%.o: %.S
    3.23 -	$(CC) $(DEFINES) -c -o $@ $<
    3.24 -
    3.25 -clean:
    3.26 -	rm -f $(TARGETS) *.o *~
    3.27 -
     4.1 --- a/tools/ioemu/pc-bios/README	Fri Jun 10 01:58:26 2005 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,13 +0,0 @@
     4.4 -- The PC BIOS comes from the Bochs project
     4.5 -  (http://bochs.sourceforge.net/). A patch from bios.diff was applied.
     4.6 -
     4.7 -- The VGA BIOS and the Cirrus VGA BIOS come from the LGPL VGA bios
     4.8 -  project (http://www.nongnu.org/vgabios/).
     4.9 -
    4.10 -- The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is
    4.11 -  available at http://site.voila.fr/jmayer/OpenHackWare/index.htm.
    4.12 -
    4.13 -- Proll is a GPL'd boot PROM for Sparc JavaStations
    4.14 -  (http://people.redhat.com/zaitcev/linux/).
    4.15 -  Applying proll.patch allows circumventing some bugs and enables
    4.16 -  faster kernel load through a hack.
     5.1 Binary file tools/ioemu/pc-bios/bios.bin has changed
     6.1 --- a/tools/ioemu/pc-bios/bios.diff	Fri Jun 10 01:58:26 2005 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,162 +0,0 @@
     6.4 -Index: rombios.c
     6.5 -===================================================================
     6.6 -RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
     6.7 -retrieving revision 1.110
     6.8 -diff -u -w -r1.110 rombios.c
     6.9 ---- rombios.c	31 May 2004 13:11:27 -0000	1.110
    6.10 -+++ rombios.c	7 Oct 2004 21:23:50 -0000
    6.11 -@@ -137,6 +137,7 @@
    6.12 - #define DEBUG_INT16        0
    6.13 - #define DEBUG_INT1A        0
    6.14 - #define DEBUG_INT74        0
    6.15 -+#define DEBUG_APM          0
    6.16 - 
    6.17 - #define BX_CPU           3
    6.18 - #define BX_USE_PS2_MOUSE 1
    6.19 -@@ -145,6 +146,7 @@
    6.20 - #define BX_SUPPORT_FLOPPY 1
    6.21 - #define BX_FLOPPY_ON_CNT 37   // 2 seconds
    6.22 - #define BX_PCIBIOS       1
    6.23 -+#define BX_APM           1
    6.24 - 
    6.25 - #define BX_USE_ATADRV    1
    6.26 - #define BX_ELTORITO_BOOT 1
    6.27 -@@ -230,17 +232,6 @@
    6.28 -   out dx,ax
    6.29 - MEND
    6.30 - 
    6.31 --MACRO HALT2
    6.32 --  ;; the HALT macro is called with the line number of the HALT call.
    6.33 --  ;; The line number is then sent to the PANIC_PORT, causing Bochs/Plex
    6.34 --  ;; to print a BX_PANIC message.  This will normally halt the simulation
    6.35 --  ;; with a message such as "BIOS panic at rombios.c, line 4091".
    6.36 --  ;; However, users can choose to make panics non-fatal and continue.
    6.37 --  mov dx,#PANIC_PORT2
    6.38 --  mov ax,#?1
    6.39 --  out dx,ax
    6.40 --MEND
    6.41 --
    6.42 - MACRO JMP_AP
    6.43 -   db 0xea
    6.44 -   dw ?2
    6.45 -@@ -1543,15 +1534,12 @@
    6.46 -     }
    6.47 - 
    6.48 -   if (action & BIOS_PRINTF_HALT) {
    6.49 --    // freeze in a busy loop.  If I do a HLT instruction, then in versions
    6.50 --    // 1.3.pre1 and earlier, it will panic without ever updating the VGA
    6.51 --    // display, so the panic message will not be visible.  By waiting
    6.52 --    // forever, you are certain to see the panic message on screen.
    6.53 --    // After a few more versions have passed, we can turn this back into
    6.54 --    // a halt or something.
    6.55 --    // do {} while (1);
    6.56 -+    // freeze in a busy loop.  
    6.57 - ASM_START
    6.58 --    HALT2(__LINE__)
    6.59 -+    cli
    6.60 -+ halt2_loop:
    6.61 -+    hlt
    6.62 -+    jmp halt2_loop
    6.63 - ASM_END
    6.64 -     }
    6.65 - }
    6.66 -@@ -5412,8 +5400,8 @@
    6.67 -         case 0x03: SET_BL( 0x06 ); break;
    6.68 -         }
    6.69 - 
    6.70 --      DI = 0xefc7;
    6.71 --      ES = 0xf000;
    6.72 -+      DI = read_word(0x00, 0x1e*4); // INT vector 0x1E
    6.73 -+      ES = read_word(0x00, 0x1e*4+2);
    6.74 -       goto int13_success;
    6.75 -       break;
    6.76 - 
    6.77 -@@ -6984,8 +6972,8 @@
    6.78 -         }
    6.79 - 
    6.80 -       /* set es & di to point to 11 byte diskette param table in ROM */
    6.81 --      DI = 0xefc7;
    6.82 --      ES = 0xf000;
    6.83 -+      DI = read_word(0x00, 0x1e*4); // INT vector 0x1E
    6.84 -+      ES = read_word(0x00, 0x1e*4+2);
    6.85 -       CLEAR_CF(); // success
    6.86 -       /* disk status not changed upon success */
    6.87 -       return;
    6.88 -@@ -7880,7 +7868,7 @@
    6.89 -   mov  al, #0x02
    6.90 -   out  #0x0a, al   ;; clear DMA-1 channel 2 mask bit
    6.91 - 
    6.92 --  SET_INT_VECTOR(0x1E, #0xF000, #diskette_param_table)
    6.93 -+  SET_INT_VECTOR(0x1E, #0xF000, #diskette_param_table2)
    6.94 -   SET_INT_VECTOR(0x40, #0xF000, #int13_diskette)
    6.95 -   SET_INT_VECTOR(0x0E, #0xF000, #int0e_handler) ;; IRQ 6
    6.96 - 
    6.97 -@@ -8344,6 +8332,19 @@
    6.98 -   pop   ax
    6.99 -   iret
   6.100 - 
   6.101 -+
   6.102 -+;--------------------
   6.103 -+#if BX_APM
   6.104 -+use32 386
   6.105 -+#define APM_PROT32
   6.106 -+#include "apmbios.S"
   6.107 -+use16 386
   6.108 -+
   6.109 -+#define APM_REAL
   6.110 -+#include "apmbios.S"
   6.111 -+
   6.112 -+#endif
   6.113 -+
   6.114 - ;--------------------
   6.115 - #if BX_PCIBIOS
   6.116 - use32 386
   6.117 -@@ -9515,6 +9516,26 @@
   6.118 -   pop  ds
   6.119 -   iret
   6.120 - 
   6.121 -+diskette_param_table2:
   6.122 -+;;  New diskette parameter table adding 3 parameters from IBM
   6.123 -+;;  Since no provisions are made for multiple drive types, most
   6.124 -+;;  values in this table are ignored.  I set parameters for 1.44M
   6.125 -+;;  floppy here
   6.126 -+db  0xAF
   6.127 -+db  0x02 ;; head load time 0000001, DMA used
   6.128 -+db  0x25
   6.129 -+db  0x02
   6.130 -+db    18
   6.131 -+db  0x1B
   6.132 -+db  0xFF
   6.133 -+db  0x6C
   6.134 -+db  0xF6
   6.135 -+db  0x0F
   6.136 -+db  0x08
   6.137 -+db    79 ;; maximum track
   6.138 -+db     0 ;; data transfer rate
   6.139 -+db     4 ;; drive type in cmos
   6.140 -+
   6.141 - .org 0xf045 ; INT 10 Functions 0-Fh Entry Point
   6.142 -   HALT(__LINE__)
   6.143 -   iret
   6.144 -@@ -9560,6 +9581,10 @@
   6.145 - .org 0xf859 ; INT 15h System Services Entry Point
   6.146 - int15_handler:
   6.147 -   pushf
   6.148 -+#if BX_APM
   6.149 -+  cmp ah, #0x53
   6.150 -+  je apm_call
   6.151 -+#endif
   6.152 -   push  ds
   6.153 -   push  es
   6.154 -   pushad
   6.155 -@@ -9570,6 +9595,10 @@
   6.156 -   popf
   6.157 -   //JMPL(iret_modify_cf)
   6.158 -   jmp iret_modify_cf
   6.159 -+#if BX_APM
   6.160 -+apm_call:
   6.161 -+  jmp _apmreal_entry
   6.162 -+#endif
   6.163 - 
   6.164 - ;; Protected mode IDT descriptor
   6.165 - ;;
     7.1 --- a/tools/ioemu/pc-bios/linux_boot.S	Fri Jun 10 01:58:26 2005 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,29 +0,0 @@
     7.4 -/*
     7.5 - * QEMU Boot sector to launch a preloaded Linux kernel
     7.6 - * Copyright (c) 2004 Fabrice Bellard
     7.7 - */
     7.8 -
     7.9 -#define LOAD_SEG 0x9000
    7.10 -        
    7.11 -.code16	
    7.12 -.text
    7.13 -	.globl	_start
    7.14 -
    7.15 -_start:
    7.16 -        cli
    7.17 -        cld
    7.18 -        mov $LOAD_SEG, %ax
    7.19 -        mov %ax, %ds
    7.20 -        mov %ax, %es
    7.21 -        mov %ax, %fs
    7.22 -        mov %ax, %gs
    7.23 -        mov %ax, %ss
    7.24 -        mov $0x8ffe, %sp
    7.25 -        ljmp $LOAD_SEG + 0x20, $0
    7.26 -
    7.27 -1:              
    7.28 -        .fill 510 - (1b - _start), 1, 0
    7.29 -
    7.30 -        /* boot sector signature */
    7.31 -        .byte 0x55
    7.32 -        .byte 0xaa
     8.1 Binary file tools/ioemu/pc-bios/linux_boot.bin has changed
     9.1 Binary file tools/ioemu/pc-bios/ppc_rom.bin has changed
    10.1 Binary file tools/ioemu/pc-bios/proll.bin has changed
    11.1 --- a/tools/ioemu/pc-bios/proll.patch	Fri Jun 10 01:58:26 2005 +0000
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,50 +0,0 @@
    11.4 -diff -ru proll_18.orig/mrcoffee/main.c proll_18/mrcoffee/main.c
    11.5 ---- proll_18.orig/mrcoffee/main.c	2002-09-13 16:16:59.000000000 +0200
    11.6 -+++ proll_18/mrcoffee/main.c	2004-09-26 11:52:23.000000000 +0200
    11.7 -@@ -101,6 +101,7 @@
    11.8 - 	le_probe();
    11.9 - 	init_net();
   11.10 - 
   11.11 -+#ifdef ORIG
   11.12 - #if 0 /* RARP */
   11.13 - 	if (rarp() != 0) fatal();
   11.14 - 	/* printrarp(); */
   11.15 -@@ -117,13 +118,20 @@
   11.16 - 	xtoa(myipaddr, fname, 8);
   11.17 - 	if (load(boot_rec.bp_siaddr, fname) != 0) fatal();
   11.18 - #endif
   11.19 -+#endif
   11.20 - 
   11.21 - 	romvec = init_openprom(bb.nbanks, bb.bankv, hiphybas);
   11.22 - 
   11.23 - 	printk("Memory used: virt 0x%x:0x%x[%dK] iomap 0x%x:0x%x\n",
   11.24 - 	    PROLBASE, (int)cmem.curp, ((unsigned) cmem.curp - PROLBASE)/1024,
   11.25 - 	    (int)cio.start, (int)cio.curp);
   11.26 -+#ifdef ORIG
   11.27 - 	set_timeout(5);  while (!chk_timeout()) { }  /* P3: let me read */
   11.28 -+#else
   11.29 -+	printk("loading kernel:");
   11.30 -+	i = ld_bypass(0x20000000);
   11.31 -+	printk(" done, size %d\n", i);
   11.32 -+#endif
   11.33 - 
   11.34 - 	{
   11.35 - 		void (*entry)(void *, int) = (void (*)(void*, int)) LOADBASE;
   11.36 -diff -ru proll_18.orig/mrcoffee/openprom.c proll_18/mrcoffee/openprom.c
   11.37 ---- proll_18.orig/mrcoffee/openprom.c	2002-09-13 16:17:03.000000000 +0200
   11.38 -+++ proll_18/mrcoffee/openprom.c	2004-09-21 21:27:16.000000000 +0200
   11.39 -@@ -144,10 +144,14 @@
   11.40 - };
   11.41 - 
   11.42 - static int cpu_nctx = NCTX_SWIFT;
   11.43 -+static int cpu_cache_line_size = 0x20;
   11.44 -+static int cpu_cache_nlines = 0x200;
   11.45 - static struct property propv_cpu[] = {
   11.46 - 	{"name",	"STP1012PGA", sizeof("STP1012PGA") },
   11.47 - 	{"device_type",	"cpu", 4 },
   11.48 - 	{"mmu-nctx",	(char*)&cpu_nctx, sizeof(int)},
   11.49 -+	{"cache-line-size",	(char*)&cpu_cache_line_size, sizeof(int)},
   11.50 -+	{"cache-nlines",	(char*)&cpu_cache_nlines, sizeof(int)},
   11.51 - 	{NULL, NULL, -1}
   11.52 - };
   11.53 - 
    12.1 Binary file tools/ioemu/pc-bios/vgabios-cirrus.bin has changed
    13.1 Binary file tools/ioemu/pc-bios/vgabios.bin has changed