summaryrefslogtreecommitdiff
path: root/arch/arm/common
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2010-11-10 15:39:07 -0800
committerDima Zavin <dima@android.com>2010-11-10 16:50:55 -0800
commit9d0ab6aabb5fc167d7cebe0f2fd1c00838099fea (patch)
tree5e13b3ba29a2229f46c5f14a0a25609b7cd6e5de /arch/arm/common
parent4084477809d9f89bcb8b72ed4ada66b8c0dfb394 (diff)
ARM: fiq_debugger: make fiq_debugger be in debug mode by default
Adds a config option that controls whether or not the console is on at boot, defaulting to no. Change-Id: Id4a3cad1c9dd4fb3c2b8c2298ca5d385a8bd0f8d Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/Kconfig8
-rw-r--r--arch/arm/common/fiq_debugger.c6
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 1777af96c309..2dbc36b05b1d 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -84,3 +84,11 @@ config FIQ_DEBUGGER_CONSOLE
help
Enables a console so that printk messages are displayed on
the debugger serial port as the occur.
+
+config FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE
+ bool "Put the FIQ debugger into console mode by default"
+ depends on FIQ_DEBUGGER_CONSOLE
+ default n
+ help
+ If enabled, this puts the fiq debugger into console mode by default.
+ Otherwise, the fiq debugger will start out in debug mode.
diff --git a/arch/arm/common/fiq_debugger.c b/arch/arm/common/fiq_debugger.c
index 6b7ce432a31d..a97c9b2c197a 100644
--- a/arch/arm/common/fiq_debugger.c
+++ b/arch/arm/common/fiq_debugger.c
@@ -95,8 +95,14 @@ static bool initial_no_sleep = true;
#else
static bool initial_no_sleep;
#endif
+
+#ifdef CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE
+static bool initial_debug_enable = true;
+static bool initial_console_enable = true;
+#else
static bool initial_debug_enable;
static bool initial_console_enable;
+#endif
module_param_named(no_sleep, initial_no_sleep, bool, 0644);
module_param_named(debug_enable, initial_debug_enable, bool, 0644);