Build a file "boot" which consists of boot1 and boot2 concatenated.
There is little if any reason to treat the two components separately and it will simplify disklabel(8) and libdisk if we didn't.
This commit is contained in:
parent
3370d4b9fe
commit
b04b95ab47
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=109886
@ -47,7 +47,10 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \
|
||||
|
||||
LDFLAGS=-nostdlib -static -N --gc-sections
|
||||
|
||||
all: boot1 boot2
|
||||
all: boot1 boot2 boot
|
||||
|
||||
boot: boot1 boot2
|
||||
cat boot1 boot2 > boot
|
||||
|
||||
boot1: boot1.out
|
||||
objcopy -S -O binary boot1.out ${.TARGET}
|
||||
@ -98,6 +101,8 @@ sio.o: sio.s
|
||||
${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
install:
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
boot ${DESTDIR}${BINDIR}/boot
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
boot1 ${DESTDIR}${BINDIR}/boot1
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
|
@ -47,7 +47,10 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \
|
||||
|
||||
LDFLAGS=-nostdlib -static -N --gc-sections
|
||||
|
||||
all: boot1 boot2
|
||||
all: boot1 boot2 boot
|
||||
|
||||
boot: boot1 boot2
|
||||
cat boot1 boot2 > boot
|
||||
|
||||
boot1: boot1.out
|
||||
objcopy -S -O binary boot1.out ${.TARGET}
|
||||
@ -98,6 +101,8 @@ sio.o: sio.s
|
||||
${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
install:
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
boot ${DESTDIR}${BINDIR}/boot
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
boot1 ${DESTDIR}${BINDIR}/boot1
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
|
Loading…
Reference in New Issue
Block a user