aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2011-10-03 13:29:03 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-10-17 04:03:03 -0400
commitf73765fcb8bb79e80af58059441eb931679e68c0 (patch)
tree80ccf1b56155904432390b00e4a0870b511547cc
parent6996f425e57d58a6f1884b7fd4bfc3ed3dd10c2d (diff)
ARM: 7116/1: debug: provide dummy default option for DEBUG_LL UART choice
Defaulting to DEBUG_ICEDCC will cause systems to hang during boot unless a hardware debugger is listening to the debug comms. channel. This patch adds a dummy UART option as the default DEBUG_LL choice which requires the platform to do the right thing. Acked-by: Stephen Boyd <sboyd@codeaurora.org> Tested-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/Kconfig.debug12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 91a826308d56..b3dc1fa30848 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -81,6 +81,14 @@ choice
81 prompt "Kernel low-level debugging port" 81 prompt "Kernel low-level debugging port"
82 depends on DEBUG_LL 82 depends on DEBUG_LL
83 83
84 config DEBUG_LL_UART_NONE
85 bool "No low-level debugging UART"
86 help
87 Say Y here if your platform doesn't provide a UART option
88 below. This relies on your platform choosing the right UART
89 definition internally in order for low-level debugging to
90 work.
91
84 config DEBUG_ICEDCC 92 config DEBUG_ICEDCC
85 bool "Kernel low-level debugging via EmbeddedICE DCC channel" 93 bool "Kernel low-level debugging via EmbeddedICE DCC channel"
86 help 94 help
@@ -89,8 +97,8 @@ choice
89 co-processor 14. This is known to work on the ARM9 style ICE 97 co-processor 14. This is known to work on the ARM9 style ICE
90 channel and on the XScale with the PEEDI. 98 channel and on the XScale with the PEEDI.
91 99
92 It does include a timeout to ensure that the system does not 100 Note that the system will appear to hang during boot if there
93 totally freeze when there is nothing connected to read. 101 is nothing connected to read from the DCC.
94 102
95 config DEBUG_FOOTBRIDGE_COM1 103 config DEBUG_FOOTBRIDGE_COM1
96 bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1" 104 bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"