diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-11-07 18:56:56 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-11-07 18:56:56 +0000 |
| commit | fdb0a025f1da65e2f076e99c304c7fd4796b343a (patch) | |
| tree | f992b32e1fd78b65502faf9a45ab3d71226c6c7d /sys/arch/sgi/conf | |
| parent | 05ea5cfbae200015db0fc343bfb527229a3c9338 (diff) | |
Replace option TGT_ORIGIN200 and TGT_ORIGIN2000 with a single option,
TGT_ORIGIN, which enables support for all IP27 and IP35 systems. The original
two options have always been used together, and go back to when pefo thought
supporting multiple nodes would be significant work. Since an Origin 200
can be a dual-node system, making a distinction between single node and
multiple node systems is a moot point anyway.
Be sure to rerun config(8) before rebuilding a kernel.
Diffstat (limited to 'sys/arch/sgi/conf')
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP27 | 5 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP27 | 5 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/files.sgi | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index 929deaa8551..4c2ddcbedee 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.18 2009/11/01 19:17:56 miod Exp $ +# $OpenBSD: GENERIC-IP27,v 1.19 2009/11/07 18:56:55 miod Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -26,8 +26,7 @@ option USER_PCICONF # User-space PCI configuration option USBVERBOSE # Define what targets to support -option TGT_ORIGIN200 # Origin 200/300, Onyx 2/3, Fuel -option TGT_ORIGIN2000 # Origin 2000/3000, Tezro +option TGT_ORIGIN # IP27/IP35 option TGT_COHERENT # Specify storage configuration (it's a joke..) diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index 95a58519250..66c5ae4c47d 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.13 2009/11/01 19:17:56 miod Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.14 2009/11/07 18:56:55 miod Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -34,8 +34,7 @@ option MINIROOTSIZE=8192 option RAMDISK_HOOKS # Define what targets to support -option TGT_ORIGIN200 # Origin 200/300, Onyx 2/3, Fuel -option TGT_ORIGIN2000 # Origin 2000/3000, Tezro +option TGT_ORIGIN # IP27/IP35 option TGT_COHERENT # Specify storage configuration using ramdisk diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi index 8afd0f245f3..a3a2461f72d 100644 --- a/sys/arch/sgi/conf/files.sgi +++ b/sys/arch/sgi/conf/files.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sgi,v 1.37 2009/11/01 19:17:56 miod Exp $ +# $OpenBSD: files.sgi,v 1.38 2009/11/07 18:56:55 miod Exp $ # # maxpartitions must be first item in files.${ARCH} # @@ -13,13 +13,13 @@ file arch/sgi/sgi/autoconf.c file arch/sgi/sgi/bus_dma.c file arch/sgi/sgi/conf.c file arch/sgi/sgi/disksubr.c disk -file arch/sgi/sgi/ip27_machdep.c tgt_origin200 | tgt_origin2000 +file arch/sgi/sgi/ip27_machdep.c tgt_origin file arch/sgi/sgi/ip30_machdep.c tgt_octane file arch/sgi/sgi/ip32_machdep.c tgt_o2 file arch/sgi/sgi/machdep.c file arch/sgi/sgi/mainbus.c file arch/sgi/sgi/mutex.c -file arch/sgi/sgi/sginode.c tgt_origin200 | tgt_origin2000 +file arch/sgi/sgi/sginode.c tgt_origin file arch/sgi/sgi/wscons_machdep.c wsdisplay # RAM disk for boot |