x86: printk kernel version in WARN_ON and other dump_stack users

[linux-2.6] / arch / powerpc / Kconfig.debug

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index c38bc22370571cc2a92e734ffff205508e52c3d9..6a79fe43e229e9036a25b8792eb45246f44db30c 100644 (file)
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -144,7 +144,7 @@ config BDI_SWITCH
 
 config BOOTX_TEXT
        bool "Support for early boot text console (BootX or OpenFirmware only)"
 
 config BOOTX_TEXT
        bool "Support for early boot text console (BootX or OpenFirmware only)"

-       depends PPC_OF && PPC_MULTIPLATFORM
+       depends on PPC_OF && PPC_MULTIPLATFORM

        help
          Say Y here to see progress messages from the boot firmware in text
          mode. Requires either BootX or Open Firmware.
        help
          Say Y here to see progress messages from the boot firmware in text
          mode. Requires either BootX or Open Firmware.


@@ -216,21 +216,41 @@ config PPC_EARLY_DEBUG_BEAT
 config PPC_EARLY_DEBUG_44x
        bool "Early serial debugging for IBM/AMCC 44x CPUs"
        depends on 44x
 config PPC_EARLY_DEBUG_44x
        bool "Early serial debugging for IBM/AMCC 44x CPUs"
        depends on 44x

-       select PPC_UDBG_16550

        help
          Select this to enable early debugging for IBM 44x chips via the
          inbuilt serial port.
 
        help
          Select this to enable early debugging for IBM 44x chips via the
          inbuilt serial port.
 

+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
+         has run, and set up the CPM in a particular way.
+

 endchoice
 
 config PPC_EARLY_DEBUG_44x_PHYSLOW
        hex "Low 32 bits of early debug UART physical address"
 endchoice
 
 config PPC_EARLY_DEBUG_44x_PHYSLOW
        hex "Low 32 bits of early debug UART physical address"

-       depends PPC_EARLY_DEBUG_44x
+       depends on PPC_EARLY_DEBUG_44x

        default "0x40000200"
 
 config PPC_EARLY_DEBUG_44x_PHYSHIGH
        hex "EPRN of early debug UART physical address"
        default "0x40000200"
 
 config PPC_EARLY_DEBUG_44x_PHYSHIGH
        hex "EPRN of early debug UART physical address"

-       depends PPC_EARLY_DEBUG_44x
+       depends on PPC_EARLY_DEBUG_44x

        default "0x1"
 
        default "0x1"
 

+config PPC_EARLY_DEBUG_CPM_ADDR
+       hex "CPM UART early debug transmit descriptor address"
+       depends on PPC_EARLY_DEBUG_CPM
+       default "0xfa202008" if PPC_EP88XC
+       default "0xf0000008" if CPM2
+       default "0xff002008" if CPM1
+       help
+         This specifies the address of the transmit descriptor
+         used for early debug output.  Because it is needed before
+         platform probing is done, all platforms selected must
+         share the same address.
+

 endmenu
 endmenu