diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-08-29 22:27:00 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-08-29 22:27:00 +0000 |
| commit | cab7472f2230c7d6c473ee08a7f8076221773fed (patch) | |
| tree | 0fecacef193d9fb2d70ce8d3c5349aeb8e5a90b0 /sys/arch | |
| parent | 919fdffefdf2c2658488df7ca1354474b48fd13b (diff) | |
ifdef partition table and NT s# w/ BEMBR
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/stand/biosboot/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/i386/stand/biosboot/biosboot.S | 20 |
2 files changed, 15 insertions, 8 deletions
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile index 78f87ed9bb2..95b2afeef59 100644 --- a/sys/arch/i386/stand/biosboot/Makefile +++ b/sys/arch/i386/stand/biosboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 1997/08/13 04:03:28 mickey Exp $ +# $OpenBSD: Makefile,v 1.10 1997/08/29 22:26:59 mickey Exp $ PROG= biosboot SRCS= biosboot.S @@ -22,4 +22,5 @@ ${PROG}: $(OBJS) $(DPADD) .include <bsd.prog.mk> CPPFLAGS+=-DLOADADDR=$(LOADADDR) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTREL=$(BOOTREL) +CPPFLAGS+=-DBEMBR #AFLAGS+=-Wa,-a diff --git a/sys/arch/i386/stand/biosboot/biosboot.S b/sys/arch/i386/stand/biosboot/biosboot.S index bf9c238ec4f..807d78c534c 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.18 1997/08/29 21:16:48 mickey Exp $ */ +/* $OpenBSD: biosboot.S,v 1.19 1997/08/29 22:26:58 mickey Exp $ */ .file "bootbios.S" @@ -312,16 +312,22 @@ Lchr: Gdtr: .word . - 1b .long BOOTREL + 1b - .globl _block_table + .globl _block_table, _block_count +_block_count: + .byte BLKCNT /* entries in _block_table */ _block_table: .word 0 /* cylinder/sector */ .byte 0 /* head */ .byte 0 /* nsect */ - . = _block_table + BLKCNT*4 - .globl _block_count -_block_count: - .byte BLKCNT /* entries in _block_table */ + # . = _block_table + BLKCNT*4 + +#ifdef BEMBR + . = 0x1b8 + .space 4, 0 /* NT registry offset from James C. Cortilier III */ + . = DOSPARTOFF + .globl _partitions + /* throw in a partition in case we are block0 as well */ . = DOSPARTOFF .globl _partitions /* throw in a partition in case we are block0 as well */ @@ -335,7 +341,7 @@ _partitions: .long 0,0 .byte 0,0,0,0,0,0,0,0 .long 0,0 - +#endif . = 0x200 - 2 /* a little signature */ .word DOSMBR_SIGNATURE |