2 files changed, 18 insertions, 1 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 46fa5ca9f5a..c6f74f1c639 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -144,6 +144,7 @@ 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
@@ -210,6 +211,7 @@ config MIPS_EV64120
         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
@@ -374,6 +376,7 @@ config MOMENCO_JAGUAR_ATX
         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/>.
@@ -391,6 +394,7 @@ config MOMENCO_OCELOT
         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/>.
@@ -480,6 +484,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,
@@ -508,6 +514,7 @@ config PMC_YOSEMITE
         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
@@ -584,6 +591,7 @@ config SGI_IP27
         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 +641,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
@@ -773,6 +782,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
@@ -793,6 +803,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
@@ -959,6 +970,7 @@ config IRQ_MV64340
 
 config DDB5XXX_COMMON
         bool
+        select SYS_SUPPORTS_KGDB
 
 config MIPS_BOARDS_GEN
         bool
@@ -1007,6 +1019,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
@@ -1019,6 +1032,7 @@ config SOC_PNX8550
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_32BIT_KERNEL
         select GENERIC_HARDIRQS_NO__DO_IRQ
+        select SYS_SUPPORTS_KGDB
 
 config SWAP_IO_SPACE
         bool
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 9351f1c04a9..d5e60a0c1de 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -39,7 +39,7 @@ config DEBUG_STACK_USAGE
 
 config KGDB
         bool "Remote GDB kernel debugging"
-        depends on DEBUG_KERNEL
+        depends on DEBUG_KERNEL && SYS_SUPPORTS_KGDB
         select DEBUG_INFO
         help
           If you say Y here, it will be possible to remotely debug the MIPS
@@ -48,6 +48,9 @@ config KGDB
           better 32 MB RAM to avoid excessive linking time. This is only
           useful for kernel hackers. If unsure, say N.
 
+config SYS_SUPPORTS_KGDB
+        bool
+
 config GDB_CONSOLE
         bool "Console output to GDB"
         depends on KGDB