separate defns for primary and unified boot blocks

This commit is contained in:
cgd 1999-03-31 06:28:41 +00:00
parent febdc0ddf2
commit be6a1d529a
2 changed files with 9 additions and 8 deletions

View File

@ -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>

View File

@ -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 */