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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/lib/Makefile
Simple merge

diff --cc drivers/power/pmic/Makefile
Simple merge

diff --cc drivers/serial/Kconfig
index 002f1dafe18134ac74cee784f3f2c3756ad5dc45,7ddda9f205599c8e884652828febf26968eccaec..ccb80d2d1d90198c5ae104b532b234d3ca33fe43
--- 1/drivers/serial/Kconfig
--- 2/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