Remove historic remnant that treated the O2 load address as the

sgimips standard.  Define it in the respective config file.
This commit is contained in:
pooka 2004-01-15 08:53:42 +00:00
parent 60b4d7ab8d
commit 6e2ad2392e
3 changed files with 6 additions and 10 deletions

View File

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

View File

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

View File

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