Build a 'fdboot' that will be used for floppy disk media. This can be made

smaller than the normal 'boot', however for now it is identical.

ok deraadt@

6 files changed, 35 insertions, 13 deletions

diff --git a/sys/arch/amd64/stand/Makefile b/sys/arch/amd64/stand/Makefile
index 2c9dbcd72cd..e40db439909 100644
--- a/sys/arch/amd64/stand/Makefile
+++ b/sys/arch/amd64/stand/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.3 2004/08/21 18:54:59 tom Exp $
+#	$OpenBSD: Makefile,v 1.4 2012/10/12 14:00:02 jsing Exp $
 
 .if ${MACHINE} == "amd64"
 SUBDIR=	etc mbr cdbr
 .endif
-SUBDIR+= biosboot installboot boot pxeboot cdboot
+SUBDIR+= biosboot boot cdboot fdboot installboot pxeboot
 
 .include <bsd.subdir.mk>
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index 154be7700eb..2646353ac5c 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,15 +1,15 @@
-#	$OpenBSD: Makefile,v 1.13 2012/10/09 13:55:36 jsing Exp $
+#	$OpenBSD: Makefile,v 1.14 2012/10/12 14:00:02 jsing Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
-MAN=	boot.8
-MLINKS=	boot.8 boot.conf.5
+MAN?=	boot.8
+MLINKS?=boot.8 boot.conf.5
 
 .if ${MACHINE} == "amd64"
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
-PROG=	boot
+PROG?=	boot
 SRCS=	srt0.S conf.c
 LD?=	ld
 SIZE?=	size
diff --git a/sys/arch/amd64/stand/fdboot/Makefile b/sys/arch/amd64/stand/fdboot/Makefile
new file mode 100644
index 00000000000..ffce0e5c0b9
--- /dev/null
+++ b/sys/arch/amd64/stand/fdboot/Makefile
@@ -0,0 +1,11 @@
+#	$OpenBSD: Makefile,v 1.1 2012/10/12 14:00:02 jsing Exp $
+
+PROG=	fdboot
+COPTS=	-DFDBOOT
+
+MAN=
+MLINKS=
+
+.PATH:	${.CURDIR}/../boot
+
+.include "${.CURDIR}/../boot/Makefile"
diff --git a/sys/arch/i386/stand/Makefile b/sys/arch/i386/stand/Makefile
index a0c4b8eb986..b37b931ae9f 100644
--- a/sys/arch/i386/stand/Makefile
+++ b/sys/arch/i386/stand/Makefile
@@ -1,13 +1,13 @@
-#	$OpenBSD: Makefile,v 1.16 2010/03/04 22:13:57 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2012/10/12 14:00:02 jsing Exp $
 
 .if ${MACHINE} == "i386"
 SUBDIR=	etc libsa libz mbr cdbr
 .endif
-SUBDIR+= biosboot installboot boot pxeboot cdboot
+SUBDIR+= biosboot boot cdboot fdboot installboot pxeboot
 
 test-fd0:
 	sudo mount /dev/fd0a /mnt
-	sudo cp /usr/mdec/boot /mnt
+	sudo cp /usr/mdec/fdboot /mnt/boot
 	sudo /usr/mdec/installboot -v /mnt/boot /usr/mdec/biosboot fd0
 	sudo umount /mnt
 
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 9edd352e28a..fc7fff893bb 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,15 +1,15 @@
-#	$OpenBSD: Makefile,v 1.40 2012/10/09 11:43:22 jsing Exp $
+#	$OpenBSD: Makefile,v 1.41 2012/10/12 14:00:02 jsing Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
-MAN=	boot.8
-MLINKS=	boot.8 boot.conf.5
+MAN?=	boot.8
+MLINKS?=boot.8 boot.conf.5
 
 .if ${MACHINE} == "i386"
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
-PROG=	boot
+PROG?=	boot
 LD?=	ld
 SIZE?=	size
 LDFLAGS+=-nostdlib -Bstatic -nopie
diff --git a/sys/arch/i386/stand/fdboot/Makefile b/sys/arch/i386/stand/fdboot/Makefile
new file mode 100644
index 00000000000..ffce0e5c0b9
--- /dev/null
+++ b/sys/arch/i386/stand/fdboot/Makefile
@@ -0,0 +1,11 @@
+#	$OpenBSD: Makefile,v 1.1 2012/10/12 14:00:02 jsing Exp $
+
+PROG=	fdboot
+COPTS=	-DFDBOOT
+
+MAN=
+MLINKS=
+
+.PATH:	${.CURDIR}/../boot
+
+.include "${.CURDIR}/../boot/Makefile"