diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x
index 35885234270b..e4b05aada693 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.3 2004/01/15 08:45:12 pooka Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.4 2004/01/15 08:53:42 pooka Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -22,11 +22,13 @@
 # Currently this config file supports O2 (IP32).
 #
 
-include		"arch/sgimips/conf/std.sgimips"
+include 	"arch/sgimips/conf/std.sgimips"
+
+makeoptions	TEXTADDR="0x80069000"	# entry point
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32_IP3x-$Revision: 1.3 $"
+#ident		"GENERIC32_IP3x-$Revision: 1.4 $"
 
 maxusers	32
 
diff --git a/sys/arch/sgimips/conf/INSTALL32_IP3x b/sys/arch/sgimips/conf/INSTALL32_IP3x
index 0dc910f7c192..d0b45122f2de 100644
--- a/sys/arch/sgimips/conf/INSTALL32_IP3x
+++ b/sys/arch/sgimips/conf/INSTALL32_IP3x
@@ -5,12 +5,8 @@
 # Pull in standard `install' config
 include 	"arch/sgimips/conf/GENERIC32_IP3x"
 
-# Set load address for generic 32-bit systems (only O2 currently)
-makeoptions	TEXTADDR=0x80069000	# O2
-
 # Enable the hooks used for initializing the root memory-disk.
 options         MEMORY_DISK_HOOKS
 options         MEMORY_DISK_IS_ROOT     # force root on memory disk
 options         MEMORY_DISK_SERVER=0    # no userspace memory disk support
 options		MEMORY_DISK_ROOT_SIZE=8192# size of memory disk, in blocks (4MB)
-
diff --git a/sys/arch/sgimips/conf/std.sgimips b/sys/arch/sgimips/conf/std.sgimips
index d2ad6a153be0..acc00a491546 100644
--- a/sys/arch/sgimips/conf/std.sgimips
+++ b/sys/arch/sgimips/conf/std.sgimips
@@ -1,4 +1,4 @@
-#	$NetBSD: std.sgimips,v 1.14 2003/08/30 22:44:40 chs Exp $
+#	$NetBSD: std.sgimips,v 1.15 2004/01/15 08:53:42 pooka Exp $
 
 machine sgimips mips
 makeoptions	MACHINE_ARCH="mipseb"
@@ -7,5 +7,3 @@ options 	EXEC_ELF32	# exec ELF32 binaries
 options 	EXEC_SCRIPT	# exec #! scripts
 
 options 	MIPS3_ENABLE_CLOCK_INTR
-
-makeoptions	DEFTEXTADDR="0x80069000"