[POWERPC] Move prototype for find_udbg_vterm() into a header file

[cascardo/linux.git] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 52283f7..c75d708 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -10,6 +10,9 @@ config AVR32
        # With EMBEDDED=n, we get lots of stuff automatically selected
        # that we usually don't need on AVR32.
        select EMBEDDED
+       select HAVE_IDE
+       select HAVE_OPROFILE
+       select HAVE_KPROBES
        help
          AVR32 is a high-performance 32-bit RISC microprocessor core,
          designed for cost-sensitive embedded applications, with particular
@@ -54,9 +57,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
        def_bool n
 
-config ARCH_SUPPORTS_OPROFILE
-       def_bool y
-
 config GENERIC_HWEIGHT
        def_bool y
 
@@ -83,37 +83,25 @@ config PLATFORM_AT32AP
        select SUBARCH_AVR32B
        select MMU
        select PERFORMANCE_COUNTERS
+       select HAVE_GPIO_LIB
+
+#
+# CPU types
+#
 
+# AP7000 derivatives
 config CPU_AT32AP700X
        bool
        select PLATFORM_AT32AP
-
-choice
-       prompt "AVR32 CPU type"
-       default CPU_AT32AP7000
-
 config CPU_AT32AP7000
-       bool "AT32AP7000"
+       bool
        select CPU_AT32AP700X
-
 config CPU_AT32AP7001
-       bool "AT32AP7001"
+       bool
        select CPU_AT32AP700X
-
 config CPU_AT32AP7002
-       bool "AT32AP7002"
-       select CPU_AT32AP700X
-
-endchoice
-
-#
-# CPU Daughterboards for ATSTK1000
-config BOARD_ATSTK1002
-       bool
-config BOARD_ATSTK1003
-       bool
-config BOARD_ATSTK1004
        bool
+       select CPU_AT32AP700X
 
 choice
        prompt "AVR32 board type"
@@ -121,12 +109,10 @@ choice
 
 config BOARD_ATSTK1000
        bool "ATSTK1000 evaluation board"
-       select BOARD_ATSTK1002 if CPU_AT32AP7000
-       select BOARD_ATSTK1003 if CPU_AT32AP7001
-       select BOARD_ATSTK1004 if CPU_AT32AP7002
 
 config BOARD_ATNGW100
        bool "ATNGW100 Network Gateway"
+       select CPU_AT32AP7000
 endchoice
 
 if BOARD_ATSTK1000
@@ -185,6 +171,16 @@ config OWNERSHIP_TRACE
          enabling Nexus-compliant debuggers to keep track of the PID of the
          currently executing task.
 
+config NMI_DEBUGGING
+       bool "NMI Debugging"
+       default n
+       help
+         Say Y here and pass the nmi_debug command-line parameter to
+         the kernel to turn on NMI debugging. Depending on the value
+         of the nmi_debug option, various pieces of information will
+         be dumped to the console when a Non-Maskable Interrupt
+         happens.
+
 # FPU emulation goes here
 
 source "kernel/Kconfig.hz"
@@ -241,8 +237,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/avr32/Kconfig.debug"
 
 source "security/Kconfig"