diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-30 07:00:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-30 07:00:30 +0000 |
| commit | 2100ccd8704a7a3bc5147b078a35823a056658c1 (patch) | |
| tree | ff4662cd5ec595ae07e2f64b6a2d1e859c2cf516 /sys | |
| parent | 23ed975a6d5eb145159abb55333c86cab3c5ae3a (diff) | |
temporary fixes to the bootblocks
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/stand/biosboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/biosboot/biosboot.S | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile index b8dc52a85eb..48881421d33 100644 --- a/sys/arch/i386/stand/biosboot/Makefile +++ b/sys/arch/i386/stand/biosboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 1997/10/22 23:25:37 mickey Exp $ +# $OpenBSD: Makefile,v 1.12 1998/03/30 07:00:28 deraadt Exp $ PROG= biosboot SRCS= biosboot.S @@ -23,5 +23,5 @@ ${PROG}: $(OBJS) $(DPADD) .include <bsd.prog.mk> CPPFLAGS+=-DLOADADDR=$(LOADADDR) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTREL=$(BOOTREL) -CPPFLAGS+=${DEBUGFLAGS} -DBEMBR +CPPFLAGS+=${DEBUGFLAGS} -DBEMBR -DDEBUG #AFLAGS+=-Wa,-a diff --git a/sys/arch/i386/stand/biosboot/biosboot.S b/sys/arch/i386/stand/biosboot/biosboot.S index a14c286b5a1..96eaa646fb3 100644 --- a/sys/arch/i386/stand/biosboot/biosboot.S +++ b/sys/arch/i386/stand/biosboot/biosboot.S @@ -1,4 +1,4 @@ -/* $OpenBSD: biosboot.S,v 1.22 1998/02/24 22:06:39 weingart Exp $ */ +/* $OpenBSD: biosboot.S,v 1.23 1998/03/30 07:00:29 deraadt Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -39,11 +39,7 @@ #define addr32 .byte 0x67 #define data32 .byte 0x66 -#ifdef DEBUG #define BLKCNT 12 /* Max without colliding with the partition table */ -#else -#define BLKCNT 16 -#endif #define BOOTSEG 0x07c0 /* boot loaded here */ #define BOOTSTACK 0xfffc /* stack starts here */ @@ -253,6 +249,9 @@ halt: movw $0x10, %eax movl %ax, %ds movl %ax, %ss + movl %ax, %es + movl %ax, %fs + movl %ax, %gs movl $BOOTSTACK, %esp #ifdef DEBUG |