Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 6313258eac6492083809c8dd6152fcfaa17259f2..5611fac0dc46793bfc23f08573eddb89a7ce2a91 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -33,6 +33,19 @@ config DEBUG_UART
          serial drivers are up and running (done in serial_init()). Otherwise
          the drivers may conflict and you will get strange output.
 
+choice
+       prompt "Select which UART will provide the debug UART"
+       depends on DEBUG_UART
+
+config DEBUG_UART_NS16550
+       bool "ns16550"
+       help
+         Select this to enable a debug UART using the ns16550 driver. You
+         will need to provide parameters to make this work. The driver will
+         be available until the real driver model serial is running.
+
+endchoice
+
 config DEBUG_UART_BASE
        hex "Base address of UART"
        depends on DEBUG_UART
@@ -53,8 +66,19 @@ config DEBUG_UART_CLOCK
          A default should be provided by your board, but if not you will need
          to use the correct value here.
 
+config DEBUG_UART_SHIFT
+       int "UART register shift"
+       depends on DEBUG_UART
+       default 0 if DEBUG_UART
+       help
+         Some UARTs (notably ns16550) support different register layouts
+         where the registers are spaced either as bytes, words or some other
+         value. Use this value to specify the shift to use, where 0=byte
+         registers, 2=32-bit word registers, etc.
+
 config UNIPHIER_SERIAL
-       bool "UniPhier on-chip UART support"
+       bool "Support for UniPhier on-chip UART"
        depends on ARCH_UNIPHIER && DM_SERIAL
        help
-         Support for the on-chip UARTs on the Panasonic UniPhier platform.
+         If you have a UniPhier based board and want to use the on-chip
+         serial ports, say Y to this option. If unsure, say N.