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

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f75cfad47ada073b12849f365f9df8ed7e17c585..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
 
@@ -493,7 +496,6 @@ config ARCH_BCM283X
        select DM_GPIO
        select OF_CONTROL
        imply FAT_WRITE
-       imply ENV_IS_IN_FAT
 
 config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
@@ -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
@@ -1038,7 +1039,6 @@ config ARCH_UNIPHIER
        select SPL_PINCTRL if SPL
        select SUPPORT_SPL
        imply FAT_WRITE
-       imply ENV_IS_IN_MMC
        help
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)