[src/trunk]: src/sys/arch/alpha/stand separate defns for primary and unified ...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b99dd17e3e47
branches:  trunk
changeset: 467926:b99dd17e3e47
user:      cgd <cgd%NetBSD.org@localhost>
date:      Wed Mar 31 06:28:41 1999 +0000

description:
separate defns for primary and unified boot blocks

diffstat:

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

diffs (61 lines):

diff -r ae76e599d265 -r b99dd17e3e47 sys/arch/alpha/stand/Makefile.bootprogs
--- a/sys/arch/alpha/stand/Makefile.bootprogs   Wed Mar 31 04:30:11 1999 +0000
+++ b/sys/arch/alpha/stand/Makefile.bootprogs   Wed Mar 31 06:28:41 1999 +0000
@@ -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 @@
 
 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 @@
                        -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 -r ae76e599d265 -r b99dd17e3e47 sys/arch/alpha/stand/common/start.S
--- a/sys/arch/alpha/stand/common/start.S       Wed Mar 31 04:30:11 1999 +0000
+++ b/sys/arch/alpha/stand/common/start.S       Wed Mar 31 06:28:41 1999 +0000
@@ -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 @@
 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 */