diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-04-29 00:10:06 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-04-29 00:10:06 +0000 |
| commit | ef4c281d8f2746d6dab17ea1e9bd6318bfee7f17 (patch) | |
| tree | ce534da5c6de56a9c89ff014be8a30e36d5cdcb6 /sys | |
| parent | 552f2423b3789c2a36507b4fa6ae9e128b9c1260 (diff) | |
.mk changes faster then i type....
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/stand/biosboot/Makefile | 6 | ||||
| -rw-r--r-- | sys/arch/i386/stand/biosboot/biosboot.S | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile index 31dc4d9f445..01ab3ad93f1 100644 --- a/sys/arch/i386/stand/biosboot/Makefile +++ b/sys/arch/i386/stand/biosboot/Makefile @@ -1,9 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:27 millert Exp $ +# $OpenBSD: Makefile,v 1.7 1997/04/29 00:10:05 mickey Exp $ PROG= biosboot SRCS= biosboot.S -# AFLAGS+=-Wa,-a -CPPFLAGS+=-DSTART=$(START) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTREL=$(BOOTREL) LD=ld LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic INSTALL_STRIP= @@ -22,3 +20,5 @@ ${PROG}: $(OBJS) $(DPADD) .include <bsd.prog.mk> +CPPFLAGS+=-DSTART=$(START) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTREL=$(BOOTREL) +# AFLAGS+=-Wa,-a diff --git a/sys/arch/i386/stand/biosboot/biosboot.S b/sys/arch/i386/stand/biosboot/biosboot.S index f6d3ad24826..042fa78e6e3 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.7 1997/04/15 08:00:44 deraadt Exp $ */ +/* $OpenBSD: biosboot.S,v 1.8 1997/04/29 00:10:05 mickey Exp $ */ .file "bootbios.S" @@ -12,14 +12,7 @@ #define data32 .byte 0x66 /* Better use 32, 48 does not seem to compile */ -#define BLKCNT 28 /* Max without colliding with the partition table */ -#if 0 -#ifdef DEBUG -#define BLKCNT 32 -#else -#define BLKCNT 48 -#endif -#endif +#define BLKCNT 20 /* Max without colliding with the partition table */ #define BOOTSEG 0x07c0 /* boot loaded here */ #define BOOTSTACK 0xfffc /* stack starts here */ |