1 files changed, 42 insertions, 4 deletions

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 067cb8480747..1b8a9c905cf7 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -141,9 +141,6 @@ config BOOTX_TEXT
 
 config PPC_EARLY_DEBUG
         bool "Early debugging (dangerous)"
-        # PPC_EARLY_DEBUG on 440 leaves AS=1 mappings above the TLB high water
-        # mark, which doesn't work with current 440 KVM.
-        depends on !KVM
         help
           Say Y to enable some early debugging facilities that may be available
           for your processor/board combination. Those facilities are hacks
@@ -222,7 +219,9 @@ config PPC_EARLY_DEBUG_BEAT
 
 config PPC_EARLY_DEBUG_44x
         bool "Early serial debugging for IBM/AMCC 44x CPUs"
-        depends on 44x
+        # PPC_EARLY_DEBUG on 440 leaves AS=1 mappings above the TLB high water
+        # mark, which doesn't work with current 440 KVM.
+        depends on 44x && !KVM
         help
           Select this to enable early debugging for IBM 44x chips via the
           inbuilt serial port.  If you enable this, ensure you set
@@ -258,8 +257,35 @@ config PPC_EARLY_DEBUG_WSP
         depends on PPC_WSP
         select PPC_UDBG_16550
 
+config PPC_EARLY_DEBUG_PS3GELIC
+        bool "Early debugging through the PS3 Ethernet port"
+        depends on PPC_PS3
+        select PS3GELIC_UDBG
+        help
+          Select this to enable early debugging for the PlayStation3 via
+          UDP broadcasts sent out through the Ethernet port.
+
+config PPC_EARLY_DEBUG_OPAL_RAW
+        bool "OPAL raw console"
+        depends on HVC_OPAL
+        help
+          Select this to enable early debugging for the PowerNV platform
+          using a "raw" console
+
+config PPC_EARLY_DEBUG_OPAL_HVSI
+        bool "OPAL hvsi console"
+        depends on HVC_OPAL
+        help
+          Select this to enable early debugging for the PowerNV platform
+          using an "hvsi" console
+
 endchoice
 
+config PPC_EARLY_DEBUG_OPAL
+        def_bool y
+        depends on PPC_EARLY_DEBUG_OPAL_RAW || PPC_EARLY_DEBUG_OPAL_HVSI
+
+
 config PPC_EARLY_DEBUG_HVSI_VTERMNO
         hex "vterm number to use with early debug HVSI"
         depends on PPC_EARLY_DEBUG_LPAR_HVSI
@@ -268,6 +294,18 @@ config PPC_EARLY_DEBUG_HVSI_VTERMNO
           You probably want 0x30000000 for your first serial port and
           0x30000001 for your second one
 
+config PPC_EARLY_DEBUG_OPAL_VTERMNO
+        hex "vterm number to use with OPAL early debug"
+        depends on PPC_EARLY_DEBUG_OPAL
+        default "0"
+        help
+          This correspond to which /dev/hvcN you want to use for early
+          debug.
+
+          On OPAL v1 (takeover) this should always be 0
+          On OPAL v2, this will be 0 for network console and 1 or 2 for
+          the machine built-in serial ports.
+
 config PPC_EARLY_DEBUG_44x_PHYSLOW
         hex "Low 32 bits of early debug UART physical address"
         depends on PPC_EARLY_DEBUG_44x