Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1bc45ed28e39da1fd45e2b8374804b63ecabe182..38ad59058f56d7f9a758d554350a60803ef8f576 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -822,6 +822,7 @@ config TARGET_LS1021AQDS
        select SUPPORT_SPL
        select ARCH_LS1021A
        select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP
 
 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
@@ -829,6 +830,7 @@ config TARGET_LS1021ATWR
        select SUPPORT_SPL
        select ARCH_LS1021A
        select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP
 
 config TARGET_LS1043AQDS
        bool "Support ls1043aqds"
@@ -888,18 +890,24 @@ config TARGET_COLIBRI_PXA270
 
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
+       select BLK
        select CLK_UNIPHIER
-       select SUPPORT_SPL
-       select SPL
-       select OF_CONTROL
-       select SPL_OF_CONTROL
-       select OF_LIBFDT
        select DM
-       select SPL_DM
        select DM_GPIO
-       select DM_SERIAL
        select DM_I2C
        select DM_MMC
+       select DM_SERIAL
+       select DM_USB
+       select OF_CONTROL
+       select OF_LIBFDT
+       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
        help
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
@@ -925,6 +933,7 @@ config ARCH_ROCKCHIP
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
+       select DM_USB if USB
 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"