diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/config.in | 170 | ||||
| -rw-r--r-- | arch/mips/defconfig | 10 | ||||
| -rw-r--r-- | arch/mips/defconfig-cobalt | 10 | ||||
| -rw-r--r-- | arch/mips/defconfig-decstation | 10 | ||||
| -rw-r--r-- | arch/mips/defconfig-ip22 | 10 | ||||
| -rw-r--r-- | arch/mips/defconfig-orion | 6 | ||||
| -rw-r--r-- | arch/mips/defconfig-rm200 | 10 |
7 files changed, 126 insertions, 100 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in index fbdeb6ac4..41b93931b 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -91,86 +91,88 @@ fi endmenu mainmenu_option next_comment - comment 'CPU selection' - - choice 'CPU type' \ - "R3000 CONFIG_CPU_R3000 \ - R6000 CONFIG_CPU_R6000 \ - R4300 CONFIG_CPU_R4300 \ - R4x00 CONFIG_CPU_R4X00 \ - R5000 CONFIG_CPU_R5000 \ - R56x0 CONFIG_CPU_NEVADA \ - R8000 CONFIG_CPU_R8000 \ - R10000 CONFIG_CPU_R10000" R4x00 - - bool 'Override CPU Options' CONFIG_CPU_ADVANCED - - if [ "$CONFIG_CPU_ADVANCED" = "y" ]; then - bool ' ll/sc Instructions available' CONFIG_CPU_HAS_LLSC - bool ' Writeback Buffer available' CONFIG_CPU_HAS_WB - else - if [ "$CONFIG_CPU_R3000" = "y" ]; then - if [ "$CONFIG_DECSTATION" = "y" ]; then - define_bool CONFIG_CPU_HAS_LLSC n - define_bool CONFIG_CPU_HAS_WB y - else - define_bool CONFIG_CPU_HAS_LLSC n - define_bool CONFIG_CPU_HAS_WB n - fi - else - define_bool CONFIG_CPU_HAS_LLSC y - define_bool CONFIG_CPU_HAS_WB n - fi - fi +comment 'Loadable module support' +bool 'Enable loadable module support' CONFIG_MODULES +if [ "$CONFIG_MODULES" = "y" ]; then + bool ' Set version information on all module symbols' CONFIG_MODVERSIONS + bool ' Kernel module loader' CONFIG_KMOD +fi +endmenu + +mainmenu_option next_comment +comment 'CPU selection' + +choice 'CPU type' \ + "R3000 CONFIG_CPU_R3000 \ + R6000 CONFIG_CPU_R6000 \ + R4300 CONFIG_CPU_R4300 \ + R4x00 CONFIG_CPU_R4X00 \ + R5000 CONFIG_CPU_R5000 \ + R56x0 CONFIG_CPU_NEVADA \ + R8000 CONFIG_CPU_R8000 \ + R10000 CONFIG_CPU_R10000" R4x00 + +bool 'Override CPU Options' CONFIG_CPU_ADVANCED + +if [ "$CONFIG_CPU_ADVANCED" = "y" ]; then + bool ' ll/sc Instructions available' CONFIG_CPU_HAS_LLSC + bool ' Writeback Buffer available' CONFIG_CPU_HAS_WB +else + if [ "$CONFIG_CPU_R3000" = "y" ]; then + if [ "$CONFIG_DECSTATION" = "y" ]; then + define_bool CONFIG_CPU_HAS_LLSC n + define_bool CONFIG_CPU_HAS_WB y + else + define_bool CONFIG_CPU_HAS_LLSC n + define_bool CONFIG_CPU_HAS_WB n + fi + else + define_bool CONFIG_CPU_HAS_LLSC y + define_bool CONFIG_CPU_HAS_WB n + fi +fi endmenu mainmenu_option next_comment comment 'General setup' +if [ "$CONFIG_DECSTATION" = "y" -o "$CONFIG_DDB5074" = "y" ]; then + define_bool CONFIG_CPU_LITTLE_ENDIAN y +else + bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN +fi + +if [ "$CONFIG_PROC_FS" = "y" ]; then + define_bool CONFIG_KCORE_ELF y +fi +define_bool CONFIG_ELF_KERNEL y - if [ "$CONFIG_DECSTATION" = "y" -o "$CONFIG_DDB5074" = "y" ]; then - define_bool CONFIG_CPU_LITTLE_ENDIAN y - else - bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN - fi - - if [ "$CONFIG_PROC_FS" = "y" ]; then - define_bool CONFIG_KCORE_ELF y - fi - define_bool CONFIG_ELF_KERNEL y - - if [ "$CONFIG_CPU_LITTLE_ENDIAN" = "n" ]; then - bool 'Include IRIX binary compatibility' CONFIG_BINFMT_IRIX - bool 'Include forward keyboard' CONFIG_FORWARD_KEYBOARD - fi - - define_bool CONFIG_BINFMT_AOUT n - define_bool CONFIG_BINFMT_ELF y - tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC - - bool 'Networking support' CONFIG_NET - - if [ "$CONFIG_PCI" = "y" ]; then - source drivers/pci/Config.in - fi - - bool 'System V IPC' CONFIG_SYSVIPC - bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT - bool 'Sysctl support' CONFIG_SYSCTL - - source drivers/parport/Config.in - - bool 'Enable loadable module support' CONFIG_MODULES - if [ "$CONFIG_MODULES" = "y" ]; then - bool ' Set version information on all symbols for modules' CONFIG_MODVERSIONS - bool ' Kernel module loader' CONFIG_KMOD - fi - - if [ "$CONFIG_DECSTATION" = "y" ]; then - bool 'TURBOchannel support' CONFIG_TC -# if [ "$CONFIG_TC" = "y" ]; then -# bool ' Access.Bus support' CONFIG_ACCESSBUS -# fi - fi +if [ "$CONFIG_CPU_LITTLE_ENDIAN" = "n" ]; then + bool 'Include IRIX binary compatibility' CONFIG_BINFMT_IRIX + bool 'Include forward keyboard' CONFIG_FORWARD_KEYBOARD +fi + +define_bool CONFIG_BINFMT_AOUT n +define_bool CONFIG_BINFMT_ELF y +tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + +bool 'Networking support' CONFIG_NET + +if [ "$CONFIG_PCI" = "y" ]; then + source drivers/pci/Config.in +fi + +bool 'System V IPC' CONFIG_SYSVIPC +bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT +bool 'Sysctl support' CONFIG_SYSCTL + +source drivers/parport/Config.in + +if [ "$CONFIG_DECSTATION" = "y" ]; then + bool 'TURBOchannel support' CONFIG_TC +# if [ "$CONFIG_TC" = "y" ]; then +# bool ' Access.Bus support' CONFIG_ACCESSBUS +# fi +fi endmenu if [ "$CONFIG_ISA" = "y" ]; then @@ -193,24 +195,24 @@ fi if [ "$CONFIG_DECSTATION" != "y" -a \ "$CONFIG_SGI_IP22" != "y" ]; then - source drivers/telephony/Config.in + source drivers/telephony/Config.in fi if [ "$CONFIG_SGI_IP22" != "y" -a \ "$CONFIG_DECSTATION" != "y" ]; then - mainmenu_option next_comment - comment 'ATA/IDE/MFM/RLL support' + mainmenu_option next_comment + comment 'ATA/IDE/MFM/RLL support' - tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE + tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE - if [ "$CONFIG_IDE" != "n" ]; then + if [ "$CONFIG_IDE" != "n" ]; then source drivers/ide/Config.in - else + else define_bool CONFIG_BLK_DEV_IDE_MODES n define_bool CONFIG_BLK_DEV_HD n - fi - endmenu + fi + endmenu fi mainmenu_option next_comment @@ -225,7 +227,7 @@ endmenu if [ "$CONFIG_DECSTATION" != "y" -a \ "$CONFIG_SGI_IP22" != "y" ]; then - source drivers/i2o/Config.in + source drivers/i2o/Config.in fi if [ "$CONFIG_NET" = "y" ]; then diff --git a/arch/mips/defconfig b/arch/mips/defconfig index c186035e5..61436603d 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -29,6 +29,13 @@ CONFIG_SGI=y # CONFIG_PCI is not set # +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# # CPU selection # # CONFIG_CPU_R3000 is not set @@ -63,9 +70,6 @@ CONFIG_SYSCTL=y # Parallel port support # # CONFIG_PARPORT is not set -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -CONFIG_KMOD=y # CONFIG_PCMCIA is not set # diff --git a/arch/mips/defconfig-cobalt b/arch/mips/defconfig-cobalt index 9f632f279..c1e508fa5 100644 --- a/arch/mips/defconfig-cobalt +++ b/arch/mips/defconfig-cobalt @@ -31,6 +31,13 @@ CONFIG_PCI=y # CONFIG_ISA is not set # +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODVERSIONS=y +CONFIG_KMOD=y + +# # CPU selection # # CONFIG_CPU_R3000 is not set @@ -64,9 +71,6 @@ CONFIG_SYSCTL=y # Parallel port support # # CONFIG_PARPORT is not set -CONFIG_MODULES=y -CONFIG_MODVERSIONS=y -CONFIG_KMOD=y # CONFIG_PCMCIA is not set # diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation index 32a880b61..d7bba78d1 100644 --- a/arch/mips/defconfig-decstation +++ b/arch/mips/defconfig-decstation @@ -26,6 +26,13 @@ CONFIG_DECSTATION=y # CONFIG_PCI is not set # +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# # CPU selection # CONFIG_CPU_R3000=y @@ -58,9 +65,6 @@ CONFIG_SYSCTL=y # Parallel port support # # CONFIG_PARPORT is not set -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -CONFIG_KMOD=y CONFIG_TC=y # CONFIG_PCMCIA is not set diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22 index c186035e5..61436603d 100644 --- a/arch/mips/defconfig-ip22 +++ b/arch/mips/defconfig-ip22 @@ -29,6 +29,13 @@ CONFIG_SGI=y # CONFIG_PCI is not set # +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# # CPU selection # # CONFIG_CPU_R3000 is not set @@ -63,9 +70,6 @@ CONFIG_SYSCTL=y # Parallel port support # # CONFIG_PARPORT is not set -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -CONFIG_KMOD=y # CONFIG_PCMCIA is not set # diff --git a/arch/mips/defconfig-orion b/arch/mips/defconfig-orion index 2ae1b11c3..d9a78da25 100644 --- a/arch/mips/defconfig-orion +++ b/arch/mips/defconfig-orion @@ -26,6 +26,11 @@ CONFIG_ORION=y # CONFIG_PCI is not set # +# Loadable module support +# +# CONFIG_MODULES is not set + +# # CPU selection # # CONFIG_CPU_R3000 is not set @@ -60,7 +65,6 @@ CONFIG_NET=y # Parallel port support # # CONFIG_PARPORT is not set -# CONFIG_MODULES is not set # CONFIG_PCMCIA is not set # diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200 index b803e01d8..5b71797a8 100644 --- a/arch/mips/defconfig-rm200 +++ b/arch/mips/defconfig-rm200 @@ -28,6 +28,13 @@ CONFIG_ISA=y CONFIG_PC_KEYB=y # +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# # CPU selection # # CONFIG_CPU_R3000 is not set @@ -61,9 +68,6 @@ CONFIG_SYSCTL=y # Parallel port support # # CONFIG_PARPORT is not set -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -CONFIG_KMOD=y # # Plug and Play configuration |