sh: Kill off duplicate symbol exports on SMP.

[safe/jmp/linux-2.6] / arch / sh / Kconfig.debug

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index dcceec9..6eb31bc 100644 (file)
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -1,5 +1,9 @@
 menu "Kernel hacking"
 
+config TRACE_IRQFLAGS_SUPPORT
+       bool
+       default y
+
 source "lib/Kconfig.debug"
 
 config SH_STANDARD_BIOS
@@ -24,11 +28,15 @@ config EARLY_SCIF_CONSOLE
          serial I/O.
 
 config EARLY_SCIF_CONSOLE_PORT
-       hex "SCIF port for early console"
+       hex
        depends on EARLY_SCIF_CONSOLE
        default "0xffe00000" if CPU_SUBTYPE_SH7780
-       default "0xfffe9800" if CPU_SUBTYPE_SH72060
+       default "0xfffe9800" if CPU_SUBTYPE_SH7206
+       default "0xf8420000" if CPU_SUBTYPE_SH7619
+       default "0xa4400000" if CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7705
+       default "0xffc30000" if CPU_SUBTYPE_SHX3
        default "0xffe80000" if CPU_SH4
+       default "0x00000000"
 
 config EARLY_PRINTK
        bool "Early printk support"
@@ -46,6 +54,10 @@ config EARLY_PRINTK
          select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
          the kernel command line option to toggle back and forth.
 
+config DEBUG_BOOTMEM
+       depends on DEBUG_KERNEL
+       bool "Debug BOOTMEM initialization"
+
 config DEBUG_STACKOVERFLOW
        bool "Check for stack overflows"
        depends on DEBUG_KERNEL
@@ -72,16 +84,18 @@ config 4KSTACKS
          on the VM subsystem for higher order allocations. This option
          will also use IRQ stacks to compensate for the reduced stackspace.
 
-config KGDB
+config SH_KGDB
        bool "Include KGDB kernel debugger"
        select FRAME_POINTER
+       select DEBUG_INFO
+       depends on CPU_SH3 || CPU_SH4
        help
          Include in-kernel hooks for kgdb, the Linux kernel source level
          debugger.  See <http://kgdb.sourceforge.net/> for more information.
          Unless you are intending to debug the kernel, say N here.
 
 menu "KGDB configuration options"
-       depends on KGDB
+       depends on SH_KGDB
 
 config MORE_COMPILE_OPTIONS
        bool "Add any additional compile options"
@@ -98,22 +112,16 @@ config KGDB_NMI
        bool "Enter KGDB on NMI"
        default n
 
-config KGDB_THREAD
-       bool "Include KGDB thread support"
-       default y
-
 config SH_KGDB_CONSOLE
        bool "Console messages through GDB"
+       depends on !SERIAL_SH_SCI_CONSOLE
+       select SERIAL_CORE_CONSOLE
        default n
 
 config KGDB_SYSRQ
        bool "Allow SysRq 'G' to enter KGDB"
        default y
 
-config KGDB_KERNEL_ASSERTS
-       bool "Include KGDB kernel assertions"
-       default n
-
 comment "Serial port setup"
 
 config KGDB_DEFPORT
@@ -126,7 +134,7 @@ config KGDB_DEFBAUD
 
 choice
        prompt "Parity"
-       depends on KGDB
+       depends on SH_KGDB
        default KGDB_DEFPARITY_N
 
 config KGDB_DEFPARITY_N
@@ -142,7 +150,7 @@ endchoice
 
 choice
        prompt "Data bits"
-       depends on KGDB
+       depends on SH_KGDB
        default KGDB_DEFBITS_8
 
 config KGDB_DEFBITS_8