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

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fe653210aeb8eaefd21d4ad004996c6794de67e3..53d0831935c40bf2ac4500af54b73c6dce38361a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -97,6 +97,9 @@ config ARM_ERRATA_833069
 config ARM_ERRATA_833471
        bool
 
+config ARM_ERRATA_845369
+       bool
+
 config ARM_ERRATA_852421
        bool
 
@@ -725,7 +728,6 @@ config ARCH_ZYNQ
        select DM_GPIO
        select SPL_DM if SPL
        select DM_MMC
-       select DM_MMC_OPS
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH
@@ -1019,7 +1021,6 @@ config TARGET_COLIBRI_PXA270
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
        select BOARD_LATE_INIT
-       select CLK_UNIPHIER
        select DM
        select DM_GPIO
        select DM_I2C
@@ -1073,7 +1074,6 @@ config ARCH_ROCKCHIP
        select DM_GPIO
        select DM_I2C
        select DM_MMC
-       select DM_MMC_OPS
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH