Hook boot0sio to the build. Use 'boot0cfg -b /boot/boot0sio' to use.

3 files changed, 14 insertions, 15 deletions

diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 2cab077..aac1821 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=		mbr boot0 btx boot2 cdboot kgzldr libi386 loader
+SUBDIR=		mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index e618141..825e50c 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		boot0
+PROG?=		boot0
 NOMAN=
 STRIP=
 BINDIR?=	/boot
@@ -23,22 +23,14 @@ BOOT_BOOT0_TICKS?=	0xb6
 # unless you are glutton for punishment.
 BOOT_BOOT0_ORG?=	0x600
 
-boot0: boot0.o
-	${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o boot0.out boot0.o
-	objcopy -S -O binary boot0.out ${.TARGET}
+${PROG}: ${PROG}.o
+	${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o ${PROG}.out ${PROG}.o
+	objcopy -S -O binary ${PROG}.out ${.TARGET}
 
-boot0.o: boot0.s
+${PROG}.o: ${PROG}.s
 	${AS} ${AFLAGS} --defsym FLAGS=${BOOT_BOOT0_FLAGS} \
 		--defsym TICKS=${BOOT_BOOT0_TICKS} ${.IMPSRC} -o ${.TARGET}
 
-boot0sio: boot0sio.o
-	${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o boot0sio.out boot0sio.o
-	objcopy -S -O binary boot0sio.out ${.TARGET}
-
-boot0sio.o: boot0sio.s
-	${AS} ${AFLAGS} --defsym FLAGS=${BOOT_BOOT0_FLAGS} \
-		--defsym TICKS=${BOOT_BOOT0_TICKS} ${.IMPSRC} -o ${.TARGET}
-
-CLEANFILES+= boot0.out boot0.o boot0sio.out boot0sio.o
+CLEANFILES+= ${PROG}.out ${PROG}.o
 
 .include <bsd.prog.mk>
diff --git a/sys/boot/i386/boot0sio/Makefile b/sys/boot/i386/boot0sio/Makefile
new file mode 100644
index 0000000..27b21aa
--- /dev/null
+++ b/sys/boot/i386/boot0sio/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../boot0
+
+PROG=	boot0sio
+
+.include "${.CURDIR}/../boot0/Makefile"