Merge git://git.denx.de/u-boot-rockchip

[platform/kernel/u-boot.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 4f6a3b8..ccb80d2 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -109,9 +109,18 @@ config DEBUG_UART_SHIFT
          value. Use this value to specify the shift to use, where 0=byte
          registers, 2=32-bit word registers, etc.
 
+config ROCKCHIP_SERIAL
+       bool "Rockchip on-chip UART support"
+       depends on ARCH_UNIPHIER && DM_SERIAL
+       help
+         Select this to enable a debug UART for Rockchip devices. This uses
+         the ns16550 driver. You will need to #define CONFIG_SYS_NS16550 in
+         your board config header. The clock input is automatically set to
+         use the oscillator (24MHz).
+
 config SANDBOX_SERIAL
        bool "Sandbox UART support"
-       depends on SANDBOX && DM
+       depends on SANDBOX
        help
          Select this to enable a seral UART for sandbox. This is required to
          operate correctly, otherwise you will see no serial output from
@@ -131,7 +140,7 @@ config SANDBOX_SERIAL
 
 config UNIPHIER_SERIAL
        bool "Support for UniPhier on-chip UART"
-       depends on ARCH_UNIPHIER && DM_SERIAL
+       depends on ARCH_UNIPHIER
        help
          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.