Updates for new bootblocks.

sys/arch/pmax/stand/Makefile.inc

@@ -1,30 +1,33 @@
-#	$NetBSD: Makefile.inc,v 1.7 1999/02/23 01:23:26 simonb Exp $
+#	$NetBSD: Makefile.inc,v 1.8 1999/03/25 12:24:56 simonb Exp $
 #
 #	NOTE: $S must correspond to the top of the 'sys' tree
 
 BINDIR=	/usr/mdec
 BINMODE=444
 
-beforedepend ${OBJS}: machine
-CLEANFILES+=machine
+.BEGIN: machine mips
+depend all ${SRCS} ${OBJS}: machine mips
+CLEANFILES+= machine mips
 
 machine:
 	-rm -f ${.TARGET}
-	ln -s $S/arch/pmax/include ${.TARGET}
+	ln -s $S/arch/${MACHINE}/include ${.TARGET}
+mips:
+	-rm -f ${.TARGET}
+	ln -s $S/arch/mips/include ${.TARGET}
 
 # Tailor C compilation for standalone environment.
 COPTS=	-Os				# -Os gives smaller code
 
 C_MACHDEP=-mmemcpy -mno-abicalls -G 128	# even smaller code
 
-# We are reasonably tight for space, ifdef away symlnks
-DEFS?=	-DSMALL -D_STANDALONE -D_NO_PROM_DEFINES -DUFS_NOCLOSE -DUFS_NOSYMLINK \
-	-DSA_NOPUTCHAR -DLIBSA_USE_MEMCPY -DLIBSA_USE_MEMSET
-INCL?=	-I. -I${.CURDIR} -I$S -I${.CURDIR}/../libsa -I$S/lib/libsa
+DEFS?=	-DSMALL -D_STANDALONE -D_NO_PROM_DEFINES -DNO_ABICALLS \
+	${BOOTDEFADD}
+INCL?=	-nostdinc -I${.OBJDIR} -I$S -I${PMAX_STAND_DIR}/lib -I$S/lib/libsa
 
-CFLAGS=	${COPTS} ${CWARN} ${INCPATH} ${DEFS} ${C_MACHDEP}
-AFLAGS=	-O2 ${INCPATH} ${DEFS} -D_LOCORE -D_KERNEL
-CPPFLAGS= ${INCL}
+CFLAGS+=	${CWARN} ${C_MACHDEP}
+AFLAGS+=	-D_LOCORE -D_KERNEL
+CPPFLAGS+=	${DEFS} ${INCL}
 
 # be sure to turn off any PIC flags for standalone library code.
 CPICFLAGS=

sys/arch/pmax/stand/scsiboot/Makefile

@@ -1,31 +1,44 @@
-#	$NetBSD: Makefile,v 1.7 1999/03/14 00:57:06 simonb Exp $
+#	$NetBSD: Makefile,v 1.8 1999/03/25 12:26:32 simonb Exp $
 #	@(#)Makefile	8.3 (Berkeley) 2/16/94
 
+RELOC_BOOTXX=80700000	# Room for an almost 7MB kernel
 
 S=	${.CURDIR}/../../../..
-PROG=	boot
-SRCS=	start.S boot.c conf.c
-CLEANFILES+=${PROG}.elf ${PROG}.map ${ALL}
 
-DPADD+=	${LIBS}
+PROG=	bootxx
+SRCS=	start.S alloc.c bootxx.c clear_cache.S memcpy.c memset.c printf.S \
+	strcmp.S strcpy.S strlen.S twiddle.c
+
+# from sys/lib/libsa:
+SRCS+=	disklabel.c dkcksum.c lseek.c open.c read.c ufs.c
+# from sys/lib/libkern:
+SRCS+=	bcmp.c
+CLEANFILES+=${PROG}.elf ${PROG}.map ${ALL}
+.PATH:  ${.CURDIR}/../lib $S/lib/libsa $S/lib/libkern
+
+BOOTDEFADD+=-DBOOTXX -DRELOC=0x${RELOC_BOOTXX} -DUFS_NOCLOSE -DUFS_NOSYMLINK \
+	-DLIBSA_USE_MEMCPY -DLIBSA_USE_MEMSET
+
 MKMAN=	no
 LDBUG=	-T $S/arch/mips/conf/stand.ldscript
 
-# Tell boot code which drivers we want to link against
-SRCS+=	rz.c
-
-
-ALL=	boot mkboot rzboot bootrz
+ALL=	bootxx mkboot rzboot bootrz
 
 all:	${ALL}
 
-${PROG}: ${OBJS} ${LIBS}
-	ld -Map ${PROG}.map -N -Ttext ${RELOC} ${LDBUG} -e start \
-		${OBJS} ${LIBS} -o ${PROG}.elf
+PMAX_STAND_DIR?= $S/arch/pmax/stand
+### find out what to use for libpmax
+PMAXDIR= ${PMAX_STAND_DIR}/lib
+.include "${PMAXDIR}/Makefile.inc"
+LIBPMAX=		${PMAXLIB}
+
+${PROG}: ${OBJS} ${LIBPMAX}
+	ld -Map ${PROG}.map -N -x -Ttext ${RELOC_BOOTXX} ${LDBUG} \
+		-e start ${OBJS} ${LIBPMAX} -o ${PROG}.elf
 	elf2aout ${PROG}.elf ${PROG}
 
 mkboot:	${.CURDIR}/mkboot.c
-	${CC} ${CPPFLAGS} ${INCPATH} -o mkboot ${.CURDIR}/mkboot.c
+	${CC} ${CPPFLAGS} -I${DESTDIR}/usr/include -o mkboot ${.IMPSRC}
 
 rzboot bootrz:	mkboot ${PROG}
 	./mkboot ${PROG} rzboot bootrz
@@ -35,5 +48,3 @@ proginstall:: bootrz rzboot
 		${.ALLSRC} ${DESTDIR}${BINDIR}
 
 .include <bsd.prog.mk>
-.include "../Makefile.inc" 	# XXX after <bsd.prog.mk> to reset CFLAGS, etc
-.include "../Makefile.booters"