diff --git a/sys/arch/macppc/conf/INSTALL b/sys/arch/macppc/conf/INSTALL index d8ab904cd68e..87adc1a93dd6 100644 --- a/sys/arch/macppc/conf/INSTALL +++ b/sys/arch/macppc/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.13 1999/08/05 00:31:01 tsubai Exp $ +# $NetBSD: INSTALL,v 1.14 1999/08/27 07:59:49 tsubai Exp $ # # config file for INSTALL FLOPPY # @@ -7,6 +7,8 @@ include "arch/macppc/conf/std.macppc" maxusers 32 +makeoptions TEXTADDR=0x800000 + # Enable the hooks used for initializing the ram-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk @@ -69,7 +71,6 @@ mesh* at obio? flags 0xffff # MESH SCSI nvram* at obio? # nvram adb* at obio? # Apple Desktop Bus akbd* at adb? # ADB keyboard -ams* at adb? # ADB mouse zsc* at obio? zstty* at zsc? channel ? mediabay* at obio? diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index 23b123836b99..23506b6e6f51 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.macppc,v 1.8 1999/07/26 05:20:46 cgd Exp $ +# $NetBSD: Makefile.macppc,v 1.9 1999/08/27 07:59:49 tsubai Exp $ # # Makefile for NetBSD # @@ -44,6 +44,7 @@ S!= cd ../../../..; pwd .endif PPC= $S/arch/macppc +TEXTADDR?= 100000 HAVE_GCC28!= ${CC} --version | egrep "^(2\.8|egcs)" ; echo INCLUDES= -I. -I$S/arch -I$S -nostdinc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmacppc @@ -53,7 +54,7 @@ CWARNFLAGS+= -Wno-main .endif CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} -msoft-float AFLAGS= -D_LOCORE -LINKFLAGS= -N -Ttext 100000 -e __start +LINKFLAGS= -N -Ttext ${TEXTADDR} -e __start STRIPFLAGS= --strip-debug %INCLUDES