Reverted boot block Makefiles to previous state due to instability.

We can't mess with this any more.  We will go with the previously working
boot blocks and install methods for release.

2 files changed, 3 insertions, 27 deletions

diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc
index 961cc6eed7e..fee77b15daa 100644
--- a/sys/arch/sparc/stand/Makefile.inc
+++ b/sys/arch/sparc/stand/Makefile.inc
@@ -17,9 +17,7 @@ RELOC_SUN4C=	0x340000
 RELOC_SUN4M=	0x440000
 
 # Note: a `RELOC' value of 0x340000 seems to work on most machines
-#RELOC?=		${RELOC_SUN4C}
-# but a bigger 'RELOC' is needed for ramdisk kernels, requires 8M memory...
-RELOC?=		0x740000
+RELOC?=		${RELOC_SUN4C}
 
 INCLUDES+=	-I. -I${.CURDIR}/.. -I${S}/arch -I${S} -I${S}/lib/libsa
 DEFS+=		-DSTANDALONE -DRELOC=${RELOC} -DSUN4 -DSUN4C -DSUN_BOOTPARAMS
diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile
index ae94a8149c4..1012b8881d6 100644
--- a/sys/arch/sparc/stand/boot/Makefile
+++ b/sys/arch/sparc/stand/boot/Makefile
@@ -1,6 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/09/30 21:43:38 pk Exp $
 
-S=	${.CURDIR}/../../../..
 R=	..
 .PATH:	${.CURDIR}/${R}
 PROG=	boot
@@ -8,30 +7,9 @@ SRCS=	srt0.S boot.c promdev.c dvma.c bootnet.c netif_sun.c conf.c version.c
 INSTALL_STRIP=
 NOMAN=	1
 BINDIR=	/usr/mdec
+LIBS!=	cd ${.CURDIR}/${R}; ${MAKE} libdep
 
-# include "library" defines and make rules
-KERN_AS=	library
-KERNDST=	${.CURDIR}/${__objdir}
-.include "${S}/lib/libkern/Makefile.inc"
-LIBKERN=	${KERNLIB}
-
-Z_AS=		library
-ZDST=		${.CURDIR}/${__objdir}
-.include "${S}/lib/libz/Makefile.inc"
-LIBZ=		${ZLIB}
-
-SA_AS=		library
-SADST=		${.CURDIR}/${__objdir}
-SAREL=
-SA_ZLIB=	yes
-.include "${S}/lib/libsa/Makefile.inc"
-LIBSA=		${SALIB}
-
-LIBS=	${LIBSA} ${LIBKERN} ${LIBSA} ${LIBZ}
-
-# ${PROG} overloads the normal rule in bsd.prog.mk
-
-${PROG}:	${OBJS} ${LIBS}
+${PROG}:${OBJS} ${LIBS}
 	${LD} -N -T ${RELOC} -e start ${OBJS} ${LIBS}
 	# convert to Sun magic
 	@size a.out