diff options
| -rw-r--r-- | sys/boot/i386/boot0/Makefile | 7 | ||||
| -rw-r--r-- | sys/boot/i386/boot0/boot0.s | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile index 08fb405..69812b3 100644 --- a/sys/boot/i386/boot0/Makefile +++ b/sys/boot/i386/boot0/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1998/10/05 10:08:37 rnordier Exp $ +# $Id: Makefile,v 1.2 1998/10/05 19:20:36 rnordier Exp $ PROG= boot0 NOMAN= @@ -10,8 +10,13 @@ M4?= m4 ORG= 0x600 boot0: boot0.o +.if ${OBJFORMAT} == aout + ${LD} -N -s -T ${ORG} -o boot0.out boot0.o + dd if=boot0.out of=${.TARGET} ibs=32 skip=1 +.else ${LD} -N -e start -Ttext ${ORG} -o boot0.out boot0.o /usr/libexec/elf/objcopy -S -O binary boot0.out ${.TARGET} +.endif boot0.o: boot0.m4 boot0.s (cd ${.CURDIR}; ${M4} boot0.m4 boot0.s) | \ diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s index cc68d90..41e373a 100644 --- a/sys/boot/i386/boot0/boot0.s +++ b/sys/boot/i386/boot0/boot0.s @@ -13,7 +13,7 @@ # purpose. # -# $Id:$ +# $Id: boot0.s,v 1.1.1.1 1998/10/05 10:08:37 rnordier Exp $ # A 512-byte boot manager. @@ -220,7 +220,7 @@ os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" os_bsd: .ascii "BS"; .byte 'D'|0x80 - .fill start+PRT_OFF-0x3-.,0x1,0x90 + .org PRT_OFF-0x3,0x90 opt: .byte 0x1 # Option ticks: .word 0xb6 # Delay |
