Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[platform/kernel/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1df6b36..b2d6e80 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -88,6 +88,12 @@ config ARM_ERRATA_833069
 config ARM_ERRATA_833471
        bool
 
+config ARM_ERRATA_852421
+       bool
+
+config ARM_ERRATA_852423
+       bool
+
 config CPU_ARM720T
        bool
        select SYS_CACHE_SHIFT_5
@@ -584,40 +590,6 @@ config ARCH_MX5
        select CPU_V7
        select BOARD_EARLY_INIT_F
 
-config TARGET_M53EVK
-       bool "Support m53evk"
-       select CPU_V7
-       select SUPPORT_SPL
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX51EVK
-       bool "Support mx51evk"
-       select BOARD_LATE_INIT
-       select CPU_V7
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX53ARD
-       bool "Support mx53ard"
-       select CPU_V7
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX53EVK
-       bool "Support mx53evk"
-       select BOARD_LATE_INIT
-       select CPU_V7
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX53LOCO
-       bool "Support mx53loco"
-       select BOARD_LATE_INIT
-       select CPU_V7
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX53SMD
-       bool "Support mx53smd"
-       select CPU_V7
-       select BOARD_EARLY_INIT_F
-
 config ARCH_RMOBILE
        bool "Renesas ARM SoCs"
        select DM
@@ -677,17 +649,20 @@ config ARCH_SUNXI
        select USB_STORAGE if DISTRO_DEFAULTS
        select USB_KEYBOARD if DISTRO_DEFAULTS
        select USE_TINY_PRINTF
+       imply PRE_CONSOLE_BUFFER
+       imply SPL_GPIO_SUPPORT
+       imply SPL_LIBCOMMON_SUPPORT
+       imply SPL_LIBDISK_SUPPORT
+       imply SPL_LIBGENERIC_SUPPORT
+       imply SPL_MMC_SUPPORT if GENERIC_MMC
+       imply SPL_POWER_SUPPORT
+       imply SPL_SERIAL_SUPPORT
 
 config TARGET_TS4600
        bool "Support TS4600"
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
-config TARGET_TS4800
-       bool "Support TS4800"
-       select CPU_V7
-       select SYS_FSL_ERRATUM_ESDHC_A001
-
 config ARCH_VF610
        bool "Freescale Vybrid"
        select CPU_V7
@@ -715,6 +690,7 @@ config ARCH_ZYNQ
        select CLK
        select SPL_CLK
        select CLK_ZYNQ
+       imply CMD_CLK
 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
@@ -1081,6 +1057,8 @@ source "arch/arm/mach-sti/Kconfig"
 
 source "arch/arm/mach-stm32/Kconfig"
 
+source "arch/arm/mach-sunxi/Kconfig"
+
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"
@@ -1098,7 +1076,6 @@ source "arch/arm/cpu/armv8/Kconfig"
 source "arch/arm/imx-common/Kconfig"
 
 source "board/aries/m28evk/Kconfig"
-source "board/aries/m53evk/Kconfig"
 source "board/bosch/shc/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
@@ -1134,11 +1111,6 @@ source "board/freescale/mx28evk/Kconfig"
 source "board/freescale/mx31ads/Kconfig"
 source "board/freescale/mx31pdk/Kconfig"
 source "board/freescale/mx35pdk/Kconfig"
-source "board/freescale/mx51evk/Kconfig"
-source "board/freescale/mx53ard/Kconfig"
-source "board/freescale/mx53evk/Kconfig"
-source "board/freescale/mx53loco/Kconfig"
-source "board/freescale/mx53smd/Kconfig"
 source "board/freescale/s32v234evb/Kconfig"
 source "board/gdsys/a38x/Kconfig"
 source "board/grinn/chiliboard/Kconfig"
@@ -1146,7 +1118,7 @@ source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hisilicon/hikey/Kconfig"
 source "board/imx31_phycore/Kconfig"
-source "board/isee/igep0033/Kconfig"
+source "board/isee/igep003x/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
@@ -1159,14 +1131,12 @@ source "board/spear/spear320/Kconfig"
 source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st/stv0991/Kconfig"
-source "board/sunxi/Kconfig"
 source "board/syteco/zmx25/Kconfig"
 source "board/tcl/sl50/Kconfig"
 source "board/birdland/bav335x/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/technologic/ts4600/Kconfig"
-source "board/technologic/ts4800/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"