1 files changed, 93 insertions, 38 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a92ce6bd7cf1..130d825e5438 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -10,7 +10,6 @@ menu "Machine selection"
 
 config ZONE_DMA
         bool
-        default y
 
 choice
         prompt "System type"
@@ -133,7 +132,7 @@ config MIPS_MIRAGE
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config BASLER_EXCITE
-        bool "Basler eXcite smart camera support"
+        bool "Basler eXcite smart camera"
         select DMA_COHERENT
         select HW_HAS_PCI
         select IRQ_CPU
@@ -144,9 +143,10 @@ config BASLER_EXCITE
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
         help
           The eXcite is a smart camera platform manufactured by
-          Basler Vision Technologies AG
+          Basler Vision Technologies AG.
 
 config BASLER_EXCITE_PROTOTYPE
         bool "Support for pre-release units"
@@ -164,8 +164,9 @@ config MIPS_COBALT
         select HW_HAS_PCI
         select I8259
         select IRQ_CPU
-        select MIPS_GT64111
+        select PCI_GT64XXX_PCI0
         select SYS_HAS_CPU_NEVADA
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -175,7 +176,7 @@ config MACH_DECSTATION
         bool "DECstations"
         select BOOT_ELF32
         select DMA_NONCOHERENT
-        select EARLY_PRINTK
+        select SYS_HAS_EARLY_PRINTK
         select IRQ_CPU
         select SYS_HAS_CPU_R3000
         select SYS_HAS_CPU_R4X00
@@ -205,11 +206,12 @@ config MIPS_EV64120
         depends on EXPERIMENTAL
         select DMA_NONCOHERENT
         select HW_HAS_PCI
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select SYS_HAS_CPU_R5000
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
         help
           This is an evaluation board based on the Galileo GT-64120
           single-chip system controller that contains a MIPS R5000 compatible
@@ -240,13 +242,14 @@ config MACH_JAZZ
 config LASAT
         bool "LASAT Networks platforms"
         select DMA_NONCOHERENT
+        select SYS_HAS_EARLY_PRINTK
         select HW_HAS_PCI
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select MIPS_NILE4
         select R5000_CPU_SCACHE
         select SYS_HAS_CPU_R5000
         select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+        select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select GENERIC_HARDIRQS_NO__DO_IRQ
 
@@ -254,11 +257,12 @@ config MIPS_ATLAS
         bool "MIPS Atlas board"
         select BOOT_ELF32
         select DMA_NONCOHERENT
+        select SYS_HAS_EARLY_PRINTK
         select IRQ_CPU
         select HW_HAS_PCI
         select MIPS_BOARDS_GEN
         select MIPS_BONITO64
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select MIPS_MSC
         select RM7000_CPU_SCACHE
         select SWAP_IO_SPACE
@@ -272,6 +276,7 @@ config MIPS_ATLAS
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
+        select SYS_SUPPORTS_SMARTMIPS
         select GENERIC_HARDIRQS_NO__DO_IRQ
         help
           This enables support for the MIPS Technologies Atlas evaluation
@@ -290,7 +295,7 @@ config MIPS_MALTA
         select MIPS_BOARDS_GEN
         select MIPS_BONITO64
         select MIPS_CPU_SCACHE
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select MIPS_MSC
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_MIPS32_R1
@@ -298,11 +303,13 @@ config MIPS_MALTA
         select SYS_HAS_CPU_MIPS64_R1
         select SYS_HAS_CPU_NEVADA
         select SYS_HAS_CPU_RM7000
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_MULTITHREADING
+        select SYS_SUPPORTS_SMARTMIPS
         help
           This enables support for the MIPS Technologies Malta evaluation
           board.
@@ -312,6 +319,7 @@ config MIPS_SEAD
         depends on EXPERIMENTAL
         select IRQ_CPU
         select DMA_NONCOHERENT
+        select SYS_HAS_EARLY_PRINTK
         select MIPS_BOARDS_GEN
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_HAS_CPU_MIPS32_R2
@@ -320,6 +328,7 @@ config MIPS_SEAD
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_SMARTMIPS
         help
           This enables support for the MIPS Technologies SEAD evaluation
           board.
@@ -330,7 +339,7 @@ config WR_PPMC
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select HW_HAS_PCI
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_HAS_CPU_MIPS32_R2
@@ -348,9 +357,11 @@ config WR_PPMC
 config MIPS_SIM
         bool 'MIPS simulator (MIPSsim)'
         select DMA_NONCOHERENT
+        select SYS_HAS_EARLY_PRINTK
         select IRQ_CPU
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_HAS_CPU_MIPS32_R2
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -371,9 +382,11 @@ config MOMENCO_JAGUAR_ATX
         select RM7000_CPU_SCACHE
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_RM9000
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
         help
           The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by
           Momentum Computer <http://www.momenco.com/>.
@@ -384,13 +397,14 @@ config MOMENCO_OCELOT
         select HW_HAS_PCI
         select IRQ_CPU
         select IRQ_CPU_RM7K
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select RM7000_CPU_SCACHE
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_RM7000
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
         help
           The Ocelot is a MIPS-based Single Board Computer (SBC) made by
           Momentum Computer <http://www.momenco.com/>.
@@ -455,11 +469,6 @@ config MIPS_XXS1500
         select SOC_AU1500
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config PNX8550_V2PCI
-        bool "Philips PNX8550 based Viper2-PCI board"
-        select PNX8550
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-
 config PNX8550_JBS
         bool "Philips PNX8550 based JBS board"
         select PNX8550
@@ -480,6 +489,8 @@ config DDB5477
         select SYS_HAS_CPU_R5432
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+        select SYS_SUPPORTS_KGDB
+        select SYS_SUPPORTS_KGDB
         select SYS_SUPPORTS_LITTLE_ENDIAN
         help
           This enables support for the R5432-based NEC DDB Vrc-5477,
@@ -489,10 +500,8 @@ config DDB5477
           ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX
-        bool "NEC VR41XX-based machines"
+        bool "NEC VR4100 series based machines"
         select SYS_HAS_CPU_VR41XX
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
         select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config PMC_YOSEMITE
@@ -504,10 +513,12 @@ config PMC_YOSEMITE
         select IRQ_CPU_RM9K
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_RM9000
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_HIGHMEM
+        select SYS_SUPPORTS_KGDB
         select SYS_SUPPORTS_SMP
         help
           Yosemite is an evaluation board for the RM9000x2 processor
@@ -528,6 +539,8 @@ config QEMU
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select ARCH_SPARSEMEM_ENABLE
         select GENERIC_HARDIRQS_NO__DO_IRQ
+        select NR_CPUS_DEFAULT_1
+        select SYS_SUPPORTS_SMP
         help
           Qemu is a software emulator which among other architectures also
           can simulate a MIPS32 4Kc system.  This patch adds support for the
@@ -563,6 +576,7 @@ config SGI_IP22
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_R4X00
         select SYS_HAS_CPU_R5000
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
@@ -577,13 +591,14 @@ config SGI_IP27
         select ARC64
         select BOOT_ELF64
         select DMA_IP27
-        select EARLY_PRINTK
+        select SYS_HAS_EARLY_PRINTK
         select HW_HAS_PCI
         select NR_CPUS_DEFAULT_64
         select PCI_DOMAINS
         select SYS_HAS_CPU_R10000
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
         select SYS_SUPPORTS_NUMA
         select SYS_SUPPORTS_SMP
         select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -633,6 +648,7 @@ config SIBYTE_SWARM
         select SYS_HAS_CPU_SB1
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_HIGHMEM
+        select SYS_SUPPORTS_KGDB
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SENTOSA
@@ -726,16 +742,18 @@ config SNI_RM
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select GENERIC_ISA_DMA
-        select HAVE_STD_PC_SERIAL_PORT
         select HW_HAS_EISA
         select HW_HAS_PCI
+        select IRQ_CPU
         select I8253
         select I8259
         select ISA
         select SWAP_IO_SPACE if CPU_BIG_ENDIAN
         select SYS_HAS_CPU_R4X00
         select SYS_HAS_CPU_R5000
+        select SYS_HAS_CPU_R10000
         select R5000_CPU_SCACHE
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
         select SYS_SUPPORTS_BIG_ENDIAN
@@ -758,6 +776,7 @@ config TOSHIBA_JMR3927
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_BIG_ENDIAN
         select TOSHIBA_BOARDS
+        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config TOSHIBA_RBTX4927
         bool "Toshiba TBTX49[23]7 board"
@@ -772,6 +791,7 @@ config TOSHIBA_RBTX4927
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
         select TOSHIBA_BOARDS
         select GENERIC_HARDIRQS_NO__DO_IRQ
         help
@@ -792,6 +812,7 @@ config TOSHIBA_RBTX4938
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_KGDB
         select TOSHIBA_BOARDS
         select GENERIC_HARDIRQS_NO__DO_IRQ
         help
@@ -812,7 +833,6 @@ source "arch/mips/tx4927/Kconfig"
 source "arch/mips/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 source "arch/mips/philips/pnx8550/common/Kconfig"
-source "arch/mips/cobalt/Kconfig"
 
 endmenu
 
@@ -882,10 +902,25 @@ config DMA_NEED_PCI_MAP_STATE
         bool
 
 config EARLY_PRINTK
+        bool "Early printk" if EMBEDDED && DEBUG_KERNEL
+        depends on SYS_HAS_EARLY_PRINTK
+        default y
+        help
+          This option enables special console drivers which allow the kernel
+          to print messages very early in the bootup process.
+
+          This is useful for kernel debugging when your machine crashes very
+          early before the console code is initialized. For normal operation
+          it is not recommended because it looks on some machines ugly and
+          oesn't cooperate with an X server. You should normally N here,
+          unless you want to debug such a crash.
+
+config SYS_HAS_EARLY_PRINTK
         bool
 
 config GENERIC_ISA_DMA
         bool
+        select ZONE_DMA
 
 config I8259
         bool
@@ -909,6 +944,7 @@ config MIPS_DISABLE_OBSOLETE_IDE
 
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
         bool
+        select ZONE_DMA
 
 #
 # Endianess selection.  Sufficiently obscure so many users don't know what to
@@ -958,14 +994,12 @@ config IRQ_MV64340
 
 config DDB5XXX_COMMON
         bool
+        select SYS_SUPPORTS_KGDB
 
 config MIPS_BOARDS_GEN
         bool
 
-config MIPS_GT64111
-        bool
-
-config MIPS_GT64120
+config PCI_GT64XXX_PCI0
         bool
 
 config MIPS_TX3927
@@ -1006,6 +1040,7 @@ config SOC_AU1X00
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_APM_EMULATION
+        select SYS_SUPPORTS_KGDB
 
 config PNX8550
         bool
@@ -1016,8 +1051,10 @@ config SOC_PNX8550
         select DMA_NONCOHERENT
         select HW_HAS_PCI
         select SYS_HAS_CPU_MIPS32_R1
+        select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select GENERIC_HARDIRQS_NO__DO_IRQ
+        select SYS_SUPPORTS_KGDB
 
 config SWAP_IO_SPACE
         bool
@@ -1066,7 +1103,7 @@ config BOOT_ELF32
 
 config MIPS_L1_CACHE_SHIFT
         int
-        default "4" if MACH_DECSTATION
+        default "4" if MACH_DECSTATION || SNI_RM
         default "7" if SGI_IP27
         default "5"
 
@@ -1075,7 +1112,7 @@ config HAVE_STD_PC_SERIAL_PORT
 
 config ARC_CONSOLE
         bool "ARC console support"
-        depends on SGI_IP22 || SNI_RM
+        depends on SGI_IP22 || (SNI_RM && CPU_LITTLE_ENDIAN)
 
 config ARC_MEMORY
         bool
@@ -1521,6 +1558,7 @@ config MIPS_MT_SMP
         select CPU_MIPSR2_IRQ_VI
         select CPU_MIPSR2_SRS
         select MIPS_MT
+        select NR_CPUS_DEFAULT_2
         select SMP
         select SYS_SUPPORTS_SMP
         help
@@ -1535,7 +1573,6 @@ config MIPS_MT_SMTC
         select CPU_MIPSR2_IRQ_VI
         select CPU_MIPSR2_SRS
         select MIPS_MT
-        select NR_CPUS_DEFAULT_2
         select NR_CPUS_DEFAULT_8
         select SMP
         select SYS_SUPPORTS_SMP
@@ -1566,7 +1603,7 @@ config MIPS_MT_FPAFF
 
 config MIPS_MT_SMTC_INSTANT_REPLAY
         bool "Low-latency Dispatch of Deferred SMTC IPIs"
-        depends on MIPS_MT_SMTC
+        depends on MIPS_MT_SMTC && !PREEMPT
         default y
         help
           SMTC pseudo-interrupts between TCs are deferred and queued
@@ -1626,6 +1663,18 @@ config 64BIT_PHYS_ADDR
 config CPU_HAS_LLSC
         bool
 
+config CPU_HAS_SMARTMIPS
+        depends on SYS_SUPPORTS_SMARTMIPS
+        bool "Support for the SmartMIPS ASE"
+        help
+          SmartMIPS is a extension of the MIPS32 architecture aimed at
+          increased security at both hardware and software level for
+          smartcards.  Enabling this option will allow proper use of the
+          SmartMIPS instructions by Linux applications.  However a kernel with
+          this option will not work on a MIPS core without SmartMIPS core.  If
+          you don't know you probably don't have SmartMIPS and should say N
+          here.
+
 config CPU_HAS_WB
         bool
 
@@ -1689,6 +1738,9 @@ config CPU_SUPPORTS_HIGHMEM
 config SYS_SUPPORTS_HIGHMEM
         bool
 
+config SYS_SUPPORTS_SMARTMIPS
+        bool
+
 config ARCH_FLATMEM_ENABLE
         def_bool y
         depends on !NUMA
@@ -1752,6 +1804,9 @@ config SMP
 config SYS_SUPPORTS_SMP
         bool
 
+config NR_CPUS_DEFAULT_1
+        bool
+
 config NR_CPUS_DEFAULT_2
         bool
 
@@ -1772,8 +1827,9 @@ config NR_CPUS_DEFAULT_64
 
 config NR_CPUS
         int "Maximum number of CPUs (2-64)"
-        range 2 64
+        range 1 64 if NR_CPUS_DEFAULT_1
         depends on SMP
+        default "1" if NR_CPUS_DEFAULT_1
         default "2" if NR_CPUS_DEFAULT_2
         default "4" if NR_CPUS_DEFAULT_4
         default "8" if NR_CPUS_DEFAULT_8
@@ -1784,10 +1840,13 @@ config NR_CPUS
           This allows you to specify the maximum number of CPUs which this
           kernel will support.  The maximum supported value is 32 for 32-bit
           kernel and 64 for 64-bit kernels; the minimum value which makes
-          sense is 2.
+          sense is 1 for Qemu (useful only for kernel debugging purposes)
+          and 2 for all others.
 
           This is purely to save memory - each supported CPU adds
-          approximately eight kilobytes to the kernel image.
+          approximately eight kilobytes to the kernel image.  For best
+          performance should round up your number of processors to the next
+          power of two.
 
 #
 # Timer Interrupt Frequency Configuration
@@ -1862,10 +1921,6 @@ config HZ
 
 source "kernel/Kconfig.preempt"
 
-config RTC_DS1742
-        bool "DS1742 BRAM/RTC support"
-        depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
-
 config MIPS_INSANE_LARGE
         bool "Support for large 64-bit configurations"
         depends on CPU_R10000 && 64BIT