ChangeSet 1.1707, 2005/06/10 07:46:07+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx
Remove tools/ioemu/pc-bios. We have replacements in tools/firmware
now.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
b/tools/ioemu/Makefile | 22 ----
b/tools/ioemu/pc-bios/bios.bin |binary
b/tools/ioemu/pc-bios/linux_boot.bin |binary
b/tools/ioemu/pc-bios/ppc_rom.bin |binary
b/tools/ioemu/pc-bios/proll.bin |binary
b/tools/ioemu/pc-bios/vgabios-cirrus.bin |binary
b/tools/ioemu/pc-bios/vgabios.bin |binary
tools/ioemu/pc-bios/Makefile | 24 -----
tools/ioemu/pc-bios/README | 9 --
tools/ioemu/pc-bios/bios.diff | 137 -------------------------------
tools/ioemu/pc-bios/linux_boot.S | 29 ------
tools/ioemu/pc-bios/proll.patch | 48 ----------
12 files changed, 269 deletions(-)
diff -Nru a/tools/ioemu/Makefile b/tools/ioemu/Makefile
--- a/tools/ioemu/Makefile 2005-06-10 03:02:24 -04:00
+++ b/tools/ioemu/Makefile 2005-06-10 03:02:25 -04:00
@@ -51,23 +51,9 @@
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 @@
$(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 -Nru a/tools/ioemu/pc-bios/Makefile b/tools/ioemu/pc-bios/Makefile
--- a/tools/ioemu/pc-bios/Makefile 2005-06-10 03:02:24 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -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 -Nru a/tools/ioemu/pc-bios/README b/tools/ioemu/pc-bios/README
--- a/tools/ioemu/pc-bios/README 2005-06-10 03:02:25 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -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.
Binary files a/tools/ioemu/pc-bios/bios.bin and b/tools/ioemu/pc-bios/bios.bin
differ
diff -Nru a/tools/ioemu/pc-bios/bios.diff b/tools/ioemu/pc-bios/bios.diff
--- a/tools/ioemu/pc-bios/bios.diff 2005-06-10 03:02:25 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -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
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home