From ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 17 Jun 2000 00:05:12 +0000 Subject: Finally desinfect Cobalt stuff. --- Documentation/Configure.help | 10 ++++++++++ arch/mips/config.in | 29 ++++++++++++----------------- arch/mips/defconfig | 1 + arch/mips/defconfig-cobalt | 9 +++------ arch/mips/defconfig-decstation | 1 + arch/mips/defconfig-ip22 | 1 + 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/Documentation/Configure.help b/Documentation/Configure.help index 86a6f345f..29ddc2a26 100644 --- a/Documentation/Configure.help +++ b/Documentation/Configure.help @@ -1576,6 +1576,16 @@ CONFIG_BAGET_MIPS more details about the Baget see the Linux/MIPS FAQ on http://oss.sgi.com/mips . +Support for Cobalt Microserver +CONFIG_COBALT_MICRO_SERVER + This enables support for the Cobalt Microserver. For more information + see the Linux/MIPS FAQ on http://oss.sgi.com/mips . + +Support for 2800 +CONFIG_COBALT_28 + This adds support for the Cobalt Microserver 2800. A kernel with this + option selected will only work on the 2800. + Support for DECstations CONFIG_DECSTATION This enables support for DEC's MIPS based workstations. For details diff --git a/arch/mips/config.in b/arch/mips/config.in index f8dc7878a..980f5186b 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.46 2000/03/26 22:59:01 ralf Exp $ +# # For a description of the syntax of this configuration file, # see the Configure script. # @@ -11,10 +11,14 @@ endmenu mainmenu_option next_comment comment 'Machine selection' -bool 'Support for Acer PICA 1 chipset' CONFIG_ACER_PICA_61 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + bool 'Support for Acer PICA 1 chipset' CONFIG_ACER_PICA_61 bool 'Support for Algorithmics P4032 (EXPERIMENTAL)' CONFIG_ALGOR_P4032 bool 'Support for BAGET MIPS series (EXPERIMENTAL)' CONFIG_BAGET_MIPS + bool 'Support for Cobalt Server' CONFIG_COBALT_MICRO_SERVER + if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then + bool ' Support for 2800' CONFIG_COBALT_28 + fi bool 'Support for DECstations (EXPERIMENTAL)' CONFIG_DECSTATION bool 'Support for NEC DDB Vrc-5074 (EXPERIMENTAL)' CONFIG_DDB5074 fi @@ -22,7 +26,6 @@ bool 'Support for Mips Magnum 4000' CONFIG_MIPS_MAGNUM_4000 bool 'Support for Olivetti M700-10' CONFIG_OLIVETTI_M700 bool 'Support for SGI IP22' CONFIG_SGI_IP22 bool 'Support for SNI RM200 PCI' CONFIG_SNI_RM200_PCI -bool 'Support for Cobalt Server' CONFIG_COBALT_MICRO_SERVER # # Select some configuration options automatically for certain systems. @@ -54,21 +57,13 @@ if [ "$CONFIG_ACER_PICA_61" = "y" ]; then define_bool CONFIG_MIPS_JAZZ y define_bool CONFIG_PC_KEYB y fi -if [ "${CONFIG_COBALT_MICRO_SERVER}" = "y" ]; then - # Let's set up some basic stuff if cobalt is selected. - define_bool COBALT_MICRO_SERVER y - define_bool CONFIG_NO_SWAPPER y - define_bool CONFIG_COBALT_27 y - define_bool CONFIG_NO_KEYBOARD y - define_bool CONFIG_NO_VIDEO_CONSOLE y - define_bool CONFIG_COBALT_LCD y - define_bool CONFIG_COBALT_SERIAL y -fi -if [ "${CONFIG_COBALT_27}" = "y" ]; then - define_bool CONFIG_PCI y - bool 'Support for 2800 (note: only works on 2800)' CONFIG_COBALT_28 n +if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then + define_bool CONFIG_ISA n + define_bool CONFIG_COBALT_27 y + define_bool CONFIG_COBALT_LCD y + define_bool CONFIG_COBALT_SERIAL y + define_bool CONFIG_PCI y fi - if [ "$CONFIG_SGI_IP22" = "y" ]; then define_bool CONFIG_ARC32 y define_bool CONFIG_PC_KEYB y diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 7bd65ce06..c7c693aa0 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -13,6 +13,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_ACER_PICA_61 is not set # CONFIG_ALGOR_P4032 is not set # CONFIG_BAGET_MIPS is not set +# CONFIG_COBALT_MICRO_SERVER is not set # CONFIG_DECSTATION is not set # CONFIG_DDB5074 is not set # CONFIG_MIPS_MAGNUM_4000 is not set diff --git a/arch/mips/defconfig-cobalt b/arch/mips/defconfig-cobalt index eca3f349b..60914623c 100644 --- a/arch/mips/defconfig-cobalt +++ b/arch/mips/defconfig-cobalt @@ -13,23 +13,20 @@ CONFIG_EXPERIMENTAL=y # CONFIG_ACER_PICA_61 is not set # CONFIG_ALGOR_P4032 is not set # CONFIG_BAGET_MIPS is not set +CONFIG_COBALT_MICRO_SERVER=y +CONFIG_COBALT_28=y # CONFIG_DECSTATION is not set # CONFIG_DDB5074 is not set # CONFIG_MIPS_MAGNUM_4000 is not set # CONFIG_OLIVETTI_M700 is not set # CONFIG_SGI_IP22 is not set # CONFIG_SNI_RM200_PCI is not set -CONFIG_COBALT_MICRO_SERVER=y # CONFIG_SBUS is not set -COBALT_MICRO_SERVER=y -CONFIG_NO_SWAPPER=y +# CONFIG_ISA is not set CONFIG_COBALT_27=y -CONFIG_NO_KEYBOARD=y -CONFIG_NO_VIDEO_CONSOLE=y CONFIG_COBALT_LCD=y CONFIG_COBALT_SERIAL=y CONFIG_PCI=y -CONFIG_COBALT_28=y # CONFIG_ISA is not set # diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation index a2eb984f3..8c62c57fc 100644 --- a/arch/mips/defconfig-decstation +++ b/arch/mips/defconfig-decstation @@ -13,6 +13,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_ACER_PICA_61 is not set # CONFIG_ALGOR_P4032 is not set # CONFIG_BAGET_MIPS is not set +# CONFIG_COBALT_MICRO_SERVER is not set CONFIG_DECSTATION=y # CONFIG_DDB5074 is not set # CONFIG_MIPS_MAGNUM_4000 is not set diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22 index 7bd65ce06..c7c693aa0 100644 --- a/arch/mips/defconfig-ip22 +++ b/arch/mips/defconfig-ip22 @@ -13,6 +13,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_ACER_PICA_61 is not set # CONFIG_ALGOR_P4032 is not set # CONFIG_BAGET_MIPS is not set +# CONFIG_COBALT_MICRO_SERVER is not set # CONFIG_DECSTATION is not set # CONFIG_DDB5074 is not set # CONFIG_MIPS_MAGNUM_4000 is not set -- cgit v1.2.3