From be6a1d529a8dc52504c3d59e195a8b5907230a9c Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Wed, 31 Mar 1999 06:28:41 +0000
Subject: [PATCH] separate defns for primary and unified boot blocks

---
 sys/arch/alpha/stand/Makefile.bootprogs |  7 ++++---
 sys/arch/alpha/stand/common/start.S     | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys/arch/alpha/stand/Makefile.bootprogs b/sys/arch/alpha/stand/Makefile.bootprogs
index 34dbbe9ffe2e..f4704054a8db 100644
--- a/sys/arch/alpha/stand/Makefile.bootprogs
+++ b/sys/arch/alpha/stand/Makefile.bootprogs
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.5 1999/03/31 02:52:11 cgd Exp $
+# $NetBSD: Makefile.bootprogs,v 1.6 1999/03/31 06:30:51 cgd Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -74,7 +74,7 @@ SECONDARY_HEAP_LIMIT=	(${REGION1_START} + ${REGION1_SIZE})
 
 FILE_FORMAT_CPPFLAGS=	-DALPHA_BOOT_ECOFF -DALPHA_BOOT_ELF
 
-UNIFIED_CPPFLAGS=	-DPRIMARY_BOOTBLOCK \
+UNIFIED_CPPFLAGS=	-DUNIFIED_BOOTBLOCK \
 			-DHEAP_LIMIT="${UNIFIED_HEAP_LIMIT}" \
 			${FILE_FORMAT_CPP_FLAGS}
 
@@ -84,7 +84,8 @@ PRIMARY_CPPFLAGS=	-DPRIMARY_BOOTBLOCK \
 			-DHEAP_LIMIT="${PRIMARY_HEAP_LIMIT}" \
 			-DHEAP_START="${PRIMARY_HEAP_START}"
 
-SECONDARY_CPPFLAGS=	-DHEAP_LIMIT="${SECONDARY_HEAP_LIMIT}" \
+SECONDARY_CPPFLAGS=	-DSECONDARY_BOOTBLOCK \
+			-DHEAP_LIMIT="${SECONDARY_HEAP_LIMIT}" \
 			${FILE_FORMAT_CPP_FLAGS}
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/alpha/stand/common/start.S b/sys/arch/alpha/stand/common/start.S
index ed0d8e801ec2..122bff6d100a 100644
--- a/sys/arch/alpha/stand/common/start.S
+++ b/sys/arch/alpha/stand/common/start.S
@@ -1,4 +1,4 @@
-/* $NetBSD: start.S,v 1.7 1999/03/31 03:04:21 cgd Exp $ */
+/* $NetBSD: start.S,v 1.8 1999/03/31 06:28:41 cgd Exp $ */
 
 /*  
  * Mach Operating System
@@ -48,19 +48,19 @@ NESTED(start, 1, ENTRY_FRAME, ra, 0, 0)
 Lstartgp:
 	LDGP(pv)
 
-#ifndef PRIMARY_BOOTBLOCK
+#if !defined(PRIMARY_BOOTBLOCK) && !defined(UNIFIED_BOOTBLOCK)
 	lda	sp,start		/* start stack below text */
 	lda	sp,-ENTRY_FRAME(sp)
 
 	or	a0,zero,s0
-#endif
+#endif /* !defined(PRIMARY_BOOTBLOCK) && !defined(UNIFIED_BOOTBLOCK) */
 	lda	a0,_edata
 	lda	a1,_end
 	subq	a1,a0,a1
 	CALL(bzero)
-#ifndef PRIMARY_BOOTBLOCK
+#if !defined(PRIMARY_BOOTBLOCK) && !defined(UNIFIED_BOOTBLOCK)
 	or	s0,zero,a0
-#endif
+#endif /* !defined(PRIMARY_BOOTBLOCK) && !defined(UNIFIED_BOOTBLOCK) */
 
 	CALL(main_)			/* transfer to C */