From f89828d99fabc320582c2954d1f8dc8e416e3894 Mon Sep 17 00:00:00 2001 From: pk Date: Mon, 21 Feb 2000 15:07:32 +0000 Subject: [PATCH] bootxx links at 0x340000 2nd-stage boot programs choices: 0x200000,0x300000,0x400000,0x700000 (default: 0x300000) --- sys/arch/sparc/stand/Makefile.buildboot | 11 +++++++---- sys/arch/sparc/stand/bootxx/Makefile | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/arch/sparc/stand/Makefile.buildboot b/sys/arch/sparc/stand/Makefile.buildboot index 86b901fc71f1..b4b1248cf9b6 100644 --- a/sys/arch/sparc/stand/Makefile.buildboot +++ b/sys/arch/sparc/stand/Makefile.buildboot @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.buildboot,v 1.10 2000/02/21 14:41:22 pk Exp $ +# $NetBSD: Makefile.buildboot,v 1.11 2000/02/21 15:07:32 pk Exp $ S= ${.CURDIR}/../../../.. @@ -10,9 +10,12 @@ SRCS= ${COMMONSOURCE} ${PROGSOURCE} MKMAN= no BINMODE= 444 -RELOCS= 240000 340000 440000 700000 -# Note: a `RELOC' value of 0x340000 seems to work on most machines -RELOC_DEFAULT?= 340000 +RELOCS= 200000 300000 400000 700000 +# Note: a `RELOC' value of 0x300000 seems to work on most machines +RELOC_DEFAULT?= 300000 +# `bootxx' is linked at a different address to circumvent i-cache +# flushing issues on Hypersparcs +RELOC_BOOTXX= 340000 CPPFLAGS+= -D_STANDALONE -DSUN4 -DSUN4C -DSUN_BOOTPARAMS -DHEAP_VARIABLE diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile index acd3f906d1fa..ca4f99d9d9e6 100644 --- a/sys/arch/sparc/stand/bootxx/Makefile +++ b/sys/arch/sparc/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/02/21 14:44:18 pk Exp $ +# $NetBSD: Makefile,v 1.13 2000/02/21 15:07:34 pk Exp $ PROG= bootxx PROGSOURCE= bootxx.c @@ -7,7 +7,7 @@ PROGSOURCE= bootxx.c CPPFLAGS+= -DBOOTXX -DLIBSA_NO_CLOSE STRIPFLAG= -LINKFLAGS= -N -Ttext ${RELOC_DEFAULT} -e start +LINKFLAGS= -N -Ttext ${RELOC_BOOTXX} -e start ${PROG}: ${OBJS} ${LIBSA} ${LIBKERN} ${LD} -o ${.TARGET} ${LINKFLAGS} ${OBJS} ${LIBSA} ${LIBKERN}