hp300 bootblocks, sync'd with NetBSD 011697, with changes and a new build

method.

1 files changed, 48 insertions, 96 deletions

diff --git a/sys/arch/hp300/stand/Makefile b/sys/arch/hp300/stand/Makefile
index ffb7b8b9c13..e653e99f6af 100644
--- a/sys/arch/hp300/stand/Makefile
+++ b/sys/arch/hp300/stand/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.19 1996/01/15 01:41:37 thorpej Exp $
-
+#	$OpenBSD: Makefile,v 1.4 1997/01/17 08:32:37 downsj Exp $
+#	$NetBSD: Makefile,v 1.22 1996/10/18 06:03:25 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/10/93
 
 NOPROG=	noprog
 NOMAN=	noman
 
-SUBDIR=	libsa
+#SUBDIR=	libkern libsa
 
 # RELOC=FFF00000 allows for boot prog up to FF000 (1044480) bytes long
 RELOC=	FFF00000
@@ -29,17 +29,17 @@ S=	${.CURDIR}/../../..
 .PATH: ${S}/stand
 
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../.. -I${S} -I${S}/lib/libsa
-### find out what to use for libkern
-KERNREL=
-.include "$S/lib/libkern/Makefile.inc"
-LIBKERN=	${KERNLIB}
+
+.include "${.CURDIR}/libkern/Makefile.inc"
+LIBKERN=	${KERN_LIB}
 
 .include "${.CURDIR}/libsa/Makefile.inc"
 LIBSA=	${SA_LIB}
 
 LIBS=	${OBJS} libdrive.a ${LIBSA} ${LIBKERN}
 
-BOOTS=	pboot netboot sys_inst dboot dcopy tboot tcopy cat #ls
+BOOTS=	uboot.lif inst.lif
+BOOTAOUTS=uboot inst
 ALL=	${BOOTS} mkboot installboot
 
 all: ${ALL}
@@ -62,76 +62,27 @@ ite.o ite_subr.o ite_dv.o ite_gb.o ite_hy.o ite_rb.o ite_tc.o: Makefile
 srt0.o: ${.CURDIR}/srt0.s
 	${CC} ${INCPATH} ${DEFS} -c ${.CURDIR}/srt0.s
 
-tpsrt0.o: ${.CURDIR}/srt0.s
-	${CC} ${INCPATH} ${DEFS} -DTP -c ${.CURDIR}/srt0.s -o $@
-
-# new boot
-pboot:	srt0.o pboot.o tgets.o conf.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o pboot.o tgets.o conf.o ${LIBS} -o $@
-	@size $@
-	@echo $@ total size should not exceed 1044480 bytes
-
-ls:	srt0.o ls.o conf.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o ls.o conf.o ${LIBS} -o $@
-	@size $@
-	@echo $@ total size should not exceed 1044480 bytes
-
-cat:	srt0.o cat.o conf.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o cat.o conf.o ${LIBS} -o $@
-	@size $@
-	@echo $@ total size should not exceed 1044480 bytes
+# unified boot program (disk, network, tape)
+uboot.lif: uboot mkboot
+	./mkboot uboot $@
 
-# installation
-sys_inst: srt0.o sys_inst.o clock.o instconf.o inst_netio.o tgets.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o sys_inst.o clock.o instconf.o inst_netio.o tgets.o ${LIBS} -o $@
+uboot:	srt0.o uboot.o tgets.o netio.o clock.o conf.o ${LIBS}
+	${LD} -N -T ${RELOC} -e begin srt0.o uboot.o tgets.o netio.o clock.o \
+	    conf.o ${LIBS} -o $@
 	@size $@
 	@echo $@ total size should not exceed 1044480 bytes
 
-instconf.o: ${.CURDIR}/conf.c
-	${CC} ${CFLAGS} -DSYS_INST -c ${.CURDIR}/conf.c -o $@
-
-inst_netio.o: ${.CURDIR}/netio.c
-	${CC} ${CFLAGS} -DSYS_INST -c ${.CURDIR}/netio.c -o $@
+# miniroot installation program
+inst.lif: inst mkboot
+	./mkboot inst $@
 
-# bootable from network
-
-netboot:	srt0.o netboot.o clock.o netconf.o netio.o tgets.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o netboot.o clock.o netconf.o netio.o tgets.o ${LIBS} -o $@
+inst: srt0.o inst.o clock.o conf.o netio.o tgets.o ${LIBS}
+	${LD} -N -T ${RELOC} -e begin srt0.o inst.o clock.o conf.o netio.o \
+	    tgets.o ${LIBS} -o $@
 	@size $@
 	@echo $@ total size should not exceed 1044480 bytes
 
-netconf.o: ${.CURDIR}/conf.c
-	${CC} ${CFLAGS} -DNETBOOT -c ${.CURDIR}/conf.c -o $@
-
-# bootable from tape
-
-tboot:	srt0.o tboot.o conf.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o tboot.o conf.o ${LIBS} -o $@
-	@size $@
-	@echo $@ total size should not exceed 1044480 bytes
-
-tboot.o: ${.CURDIR}/boot.c
-	${CC} ${CFLAGS} -DJUSTASK -c ${.CURDIR}/boot.c -o $@
-
-tcopy:	tpsrt0.o copy.o conf.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin tpsrt0.o copy.o conf.o ${LIBS} -o $@
-	@size $@
-	@echo $@ total size should not exceed 1044480 bytes
-
-# bootable from floppy or real disks
-
-dboot:	srt0.o boot.o tapeconf.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o boot.o tapeconf.o ${LIBS} -o $@
-	@size $@
-	@echo $@ text+data size should not exceed 57344 bytes
-	@echo $@ total size should not exceed 1044480 bytes
-
-tapeconf.o: ${.CURDIR}/conf.c
-	${CC} ${CFLAGS} -DTAPEBOOT -c ${.CURDIR}/conf.c -o $@
-
-dcopy:	srt0.o copy.o conf.o ${LIBS}
-	${LD} -N -T ${RELOC} -e begin srt0.o copy.o conf.o ${LIBS} -o $@
-
+# helper program ... turns OMAGIC into LIF
 mkboot: ${.CURDIR}/mkboot.c
 	${CC} ${CFLAGS} ${.CURDIR}/mkboot.c -o $@
 
@@ -142,35 +93,36 @@ installboot: ${.CURDIR}/installboot.sh
 # utilities
 
 clean::
-	rm -f *.o *.exe *.i errs make.out
-	rm -f a.out pboot cat ls tboot tcopy
-	rm -f boot[a-z]? boot[a-wyz][a-z].c conf[a-wyz][a-z].c
-	rm -f core sboot
-	rm -f libdrive.a mkboot dboot dcopy installboot *.lif
-
-install: mkboot installboot ${ALL}
-	./mkboot pboot bsdboot.lif
-	./mkboot netboot netboot.lif
-	./mkboot sys_inst sys_inst.lif
-	./mkboot dboot diskboot.lif
-	./mkboot tboot tcopy tapeboot.lif
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 installboot \
+	rm -f *.o *.i
+	rm -f a.out ${BOOTS} ${BOOTAOUTS}
+	rm -f libdrive.a mkboot installboot
+
+install:
+	${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} \
+	    ${DESTDIR}/usr/mdec/rbootd
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 installboot \
 	    ${DESTDIR}/usr/mdec
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 bsdboot.lif \
-	    ${DESTDIR}/usr/mdec/rdboot
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 uboot.lif \
+	    ${DESTDIR}/usr/mdec
+	rm -f ${DESTDIR}/usr/mdec/rdboot
+	ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/rdboot
 	rm -f ${DESTDIR}/usr/mdec/bootrd
-	ln ${DESTDIR}/usr/mdec/rdboot ${DESTDIR}/usr/mdec/bootrd
+	ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/bootrd
 	rm -f ${DESTDIR}/usr/mdec/sdboot
-	ln ${DESTDIR}/usr/mdec/rdboot ${DESTDIR}/usr/mdec/sdboot
+	ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/sdboot
 	rm -f ${DESTDIR}/usr/mdec/bootsd
-	ln ${DESTDIR}/usr/mdec/sdboot ${DESTDIR}/usr/mdec/bootsd
-	install -d -m 755 -o ${BINOWN} -g ${BINGRP} ${DESTDIR}/usr/mdec/rbootd
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 netboot.lif \
-	    ${DESTDIR}/usr/mdec/rbootd/SYS_NBOOT
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 sys_inst.lif \
-	    ${DESTDIR}/usr/mdec/rbootd/SYS_INST
-	install -c -o ${BINOWN} -g ${BINGRP} -m 644 tapeboot.lif \
-	    ${DESTDIR}/usr/mdec/bootct
+	ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/bootsd
+	rm -f ${DESTDIR}/usr/mdec/ctboot
+	ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/ctboot
+	rm -f ${DESTDIR}/usr/mdec/bootct
+	ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/bootct
+	rm -f ${DESTDIR}/usr/mdec/rbootd/SYS_UBOOT
+	ln ${DESTDIR}/usr/mdec/uboot.lif ${DESTDIR}/usr/mdec/rbootd/SYS_UBOOT
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 inst.lif \
+	    ${DESTDIR}/usr/mdec
+	rm -f ${DESTDIR}/usr/mdec/rbootd/SYS_INST
+	ln ${DESTDIR}/usr/mdec/inst.lif ${DESTDIR}/usr/mdec/rbootd/SYS_INST
+
+#obj: _SUBDIRUSE
 
 .include <bsd.prog.mk>
-.include <bsd.subdir.mk>