diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-19 13:44:48 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-20 01:53:24 -0400 |
commit | b8bb922c680b7e21af2268bc8eec93b17f5b9ab8 (patch) | |
tree | 09a251e2bf24296ad6bbfb238a37e2e58e70dcbf /arch/powerpc/Kconfig.debug | |
parent | ac07a4a57f7408922a0b3d4dcb87104fe8a3d8ca (diff) |
powerpc/udbg: Fix Kconfig entry for avoiding 44x early debug with KVM
It was preventing the global early debug selection whenever KVM was enabled
instead of only preventing the 440 specific one.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/Kconfig.debug')
-rw-r--r-- | arch/powerpc/Kconfig.debug | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index ab2335f160a0..06eb62b0fd90 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
@@ -141,9 +141,6 @@ config BOOTX_TEXT | |||
141 | 141 | ||
142 | config PPC_EARLY_DEBUG | 142 | config PPC_EARLY_DEBUG |
143 | bool "Early debugging (dangerous)" | 143 | bool "Early debugging (dangerous)" |
144 | # PPC_EARLY_DEBUG on 440 leaves AS=1 mappings above the TLB high water | ||
145 | # mark, which doesn't work with current 440 KVM. | ||
146 | depends on !KVM | ||
147 | help | 144 | help |
148 | Say Y to enable some early debugging facilities that may be available | 145 | Say Y to enable some early debugging facilities that may be available |
149 | for your processor/board combination. Those facilities are hacks | 146 | for your processor/board combination. Those facilities are hacks |
@@ -222,7 +219,9 @@ config PPC_EARLY_DEBUG_BEAT | |||
222 | 219 | ||
223 | config PPC_EARLY_DEBUG_44x | 220 | config PPC_EARLY_DEBUG_44x |
224 | bool "Early serial debugging for IBM/AMCC 44x CPUs" | 221 | bool "Early serial debugging for IBM/AMCC 44x CPUs" |
225 | depends on 44x | 222 | # PPC_EARLY_DEBUG on 440 leaves AS=1 mappings above the TLB high water |
223 | # mark, which doesn't work with current 440 KVM. | ||
224 | depends on 44x && !KVM | ||
226 | help | 225 | help |
227 | Select this to enable early debugging for IBM 44x chips via the | 226 | Select this to enable early debugging for IBM 44x chips via the |
228 | inbuilt serial port. If you enable this, ensure you set | 227 | inbuilt serial port. If you enable this, ensure you set |