Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / arch / powerpc / Kconfig.debug

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index d3fcf7e64e3a4a68980fca0c1067794cddadf977..171047822b561dccb1a72e60c8bc957d43c1588e 100644 (file)
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -149,14 +149,14 @@ config PPC_EARLY_DEBUG_BOOTX
 
 config PPC_EARLY_DEBUG_LPAR
        bool "LPAR HV Console"
-       depends on PPC_PSERIES
+       depends on PPC_PSERIES && HVC_CONSOLE
        help
          Select this to enable early debugging for a machine with a HVC
          console on vterm 0.
 
 config PPC_EARLY_DEBUG_LPAR_HVSI
        bool "LPAR HVSI Console"
-       depends on PPC_PSERIES
+       depends on PPC_PSERIES && HVC_CONSOLE
        help
          Select this to enable early debugging for a machine with a HVSI
          console on a specified vterm.
@@ -212,7 +212,6 @@ config PPC_EARLY_DEBUG_40x
 config PPC_EARLY_DEBUG_CPM
        bool "Early serial debugging for Freescale CPM-based serial ports"
        depends on SERIAL_CPM
-       select PIN_TLB if PPC_8xx
        help
          Select this to enable early debugging for Freescale chips
          using a CPM-based serial port.  This assumes that the bootwrapper