From: Tom Rini <trini@konsulko.com>
Date: Thu, 3 Sep 2015 18:57:09 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2015.10-rc3~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c9feb427aba860ebc79f9851a1bb49cc456a2d48;p=u-boot

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

c9feb427aba860ebc79f9851a1bb49cc456a2d48
diff --cc drivers/serial/Kconfig
index 002f1dafe1,7ddda9f205..ccb80d2d1d
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -109,9 -109,18 +109,18 @@@ config DEBUG_UART_SHIF
  	  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