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

diff --combined arch/arm/Kconfig
index 5de3bfcc9f9cd3448e48c409fd0f4ea07256fc7c,9b85635d543dad5bbb3020b1cd21001aa4e9292a..0083bf9ef001d67c5faf0256755532a748141afa
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -868,8 -868,6 +868,8 @@@ config ARCH_UNIPHIE
        select PINCTRL
        select SPL
        select SPL_DM
 +      select SPL_LIBCOMMON_SUPPORT
 +      select SPL_LIBGENERIC_SUPPORT
        select SPL_OF_CONTROL
        select SPL_PINCTRL
        select SUPPORT_SPL
@@@ -898,6 -896,7 +898,7 @@@ config ARCH_ROCKCHI
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
+       select DM_USB if USB
  
  config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"