Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / blackfin / Kconfig.debug

diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug
index aec89a5..acb8379 100644 (file)
--- a/arch/blackfin/Kconfig.debug
+++ b/arch/blackfin/Kconfig.debug
@@ -102,17 +102,6 @@ config DEBUG_DOUBLEFAULT_RESET
 
 endchoice
 
-config DEBUG_ICACHE_CHECK
-       bool "Check Instruction cache coherency"
-       depends on DEBUG_KERNEL
-       depends on DEBUG_HWERR
-       help
-         Say Y here if you are getting weird unexplained errors. This will
-         ensure that icache is what SDRAM says it should be by doing a
-         byte wise comparison between SDRAM and instruction cache. This
-         also relocates the irq_panic() function to L1 memory, (which is
-         un-cached).
-
 config DEBUG_HUNT_FOR_ZERO
        bool "Catch NULL pointer reads/writes"
        default y
@@ -238,7 +227,7 @@ config EARLY_PRINTK
 config NMI_WATCHDOG
        bool "Enable NMI watchdog to help debugging lockup on SMP"
        default n
-       depends on (SMP && !BFIN_SCRATCH_REG_RETN)
+       depends on SMP
        help
          If any CPU in the system does not execute the period local timer
          interrupt for more than 5 seconds, then the NMI handler dumps debug
@@ -264,4 +253,13 @@ config BFIN_ISRAM_SELF_TEST
        help
          Run some self tests of the isram driver code at boot.
 
+config BFIN_PSEUDODBG_INSNS
+       bool "Support pseudo debug instructions"
+       default n
+       help
+         This option allows the kernel to emulate some pseudo instructions which
+         allow simulator test cases to be run under Linux with no changes.
+
+         Most people should say N here.
+
 endmenu