Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5feef970a6d7817f9dd45c3dede6ad635168f068..c4371c71733e2c29cf44ce3d39b1cfbe12d95ae0 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -70,7 +70,7 @@ config SYS_L2CACHE_OFF
 
 choice
        prompt "Target select"
-       default ARCH_VERSATILE
+       default TARGET_HIKEY
 
 config ARCH_AT91
        bool "Atmel AT91"
@@ -79,10 +79,6 @@ config TARGET_EDB93XX
        bool "Support edb93xx"
        select CPU_ARM920T
 
-config TARGET_SCB9328
-       bool "Support scb9328"
-       select CPU_ARM920T
-
 config TARGET_VCMA9
        bool "Support VCMA9"
        select CPU_ARM920T
@@ -138,11 +134,6 @@ config TARGET_MX25PDK
        bool "Support mx25pdk"
        select CPU_ARM926EJS
 
-config TARGET_TX25
-       bool "Support tx25"
-       select CPU_ARM926EJS
-       select SUPPORT_SPL
-
 config TARGET_ZMX25
        bool "Support zmx25"
        select CPU_ARM926EJS
@@ -152,14 +143,6 @@ config TARGET_APF27
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
-config TARGET_IMX27LITE
-       bool "Support imx27lite"
-       select CPU_ARM926EJS
-
-config TARGET_MAGNESIUM
-       bool "Support magnesium"
-       select CPU_ARM926EJS
-
 config TARGET_APX4DEVKIT
        bool "Support apx4devkit"
        select CPU_ARM926EJS
@@ -205,10 +188,6 @@ config TARGET_SC_SPS_1
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
-config ARCH_NOMADIK
-       bool "ST-Ericsson Nomadik"
-       select CPU_ARM926EJS
-
 config ORION5X
        bool "Marvell Orion"
        select CPU_ARM926EJS
@@ -243,18 +222,10 @@ config TARGET_X600
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
-config ARCH_VERSATILE
-       bool "ARM Ltd. Versatile family"
-       select CPU_ARM926EJS
-
 config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore"
        select CPU_ARM1136
 
-config TARGET_QONG
-       bool "Support qong"
-       select CPU_ARM1136
-
 config TARGET_MX31ADS
        bool "Support mx31ads"
        select CPU_ARM1136
@@ -264,14 +235,6 @@ config TARGET_MX31PDK
        select CPU_ARM1136
        select SUPPORT_SPL
 
-config TARGET_TT01
-       bool "Support tt01"
-       select CPU_ARM1136
-
-config TARGET_IMX31_LITEKIT
-       bool "Support imx31_litekit"
-       select CPU_ARM1136
-
 config TARGET_WOODBURN
        bool "Support woodburn"
        select CPU_ARM1136
@@ -400,6 +363,13 @@ config TARGET_AM335X_EVM
        select DM_SERIAL
        select DM_GPIO
 
+config TARGET_AM335X_SL50
+       bool "Support am335x_sl50"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+
 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
        select CPU_V7
@@ -472,6 +442,10 @@ config ARCH_KEYSTONE
        select CPU_V7
        select SUPPORT_SPL
 
+config ARCH_MX7
+       bool "Freescale MX7"
+       select CPU_V7
+
 config ARCH_MX6
        bool "Freescale MX6"
        select CPU_V7
@@ -485,10 +459,6 @@ config TARGET_M53EVK
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_IMA3_MX53
-       bool "Support ima3-mx53"
-       select CPU_V7
-
 config TARGET_MX51EVK
        bool "Support mx51evk"
        select CPU_V7
@@ -509,14 +479,6 @@ config TARGET_MX53SMD
        bool "Support mx53smd"
        select CPU_V7
 
-config TARGET_MX51_EFIKAMX
-       bool "Support mx51_efikamx"
-       select CPU_V7
-
-config TARGET_VISION2
-       bool "Support vision2"
-       select CPU_V7
-
 config OMAP34XX
        bool "OMAP34XX SoC"
        select CPU_V7
@@ -539,6 +501,8 @@ config ARCH_SOCFPGA
        bool "Altera SOCFPGA family"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_OF_CONTROL
        select DM
        select DM_SPI_FLASH
        select DM_SPI
@@ -562,18 +526,10 @@ config ARCH_SUNXI
        select USB_STORAGE
        select USB_KEYBOARD
 
-config TARGET_SNOWBALL
-       bool "Support snowball"
-       select CPU_V7
-
 config TARGET_TS4800
        bool "Support TS4800"
        select CPU_V7
 
-config TARGET_U8500_HREF
-       bool "Support u8500_href"
-       select CPU_V7
-
 config TARGET_VF610TWR
        bool "Support vf610twr"
        select CPU_V7
@@ -660,60 +616,14 @@ config TARGET_LS1021ATWR
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_BALLOON3
-       bool "Support balloon3"
-       select CPU_PXA
-
 config TARGET_H2200
        bool "Support h2200"
        select CPU_PXA
 
-config TARGET_PALMLD
-       bool "Support palmld"
-       select CPU_PXA
-
-config TARGET_PALMTC
-       bool "Support palmtc"
-       select CPU_PXA
-
-config TARGET_PALMTREO680
-       bool "Support palmtreo680"
-       select CPU_PXA
-       select SUPPORT_SPL
-
-config TARGET_PXA255_IDP
-       bool "Support pxa255_idp"
-       select CPU_PXA
-
-config TARGET_TRIZEPSIV
-       bool "Support trizepsiv"
-       select CPU_PXA
-
-config TARGET_VPAC270
-       bool "Support vpac270"
-       select CPU_PXA
-       select SUPPORT_SPL
-
-config TARGET_XAENIAX
-       bool "Support xaeniax"
-       select CPU_PXA
-
-config TARGET_ZIPITZ2
-       bool "Support zipitz2"
-       select CPU_PXA
-
-config TARGET_LP8X4X
-       bool "Support lp8x4x"
-       select CPU_PXA
-
 config TARGET_COLIBRI_PXA270
        bool "Support colibri_pxa270"
        select CPU_PXA
 
-config TARGET_JORNADA
-       bool "Support jornada"
-       select CPU_SA1100
-
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
        select CPU_V7
@@ -733,6 +643,14 @@ config TARGET_STM32F429_DISCOVERY
        bool "Support STM32F429 Discovery"
        select CPU_V7M
 
+config ARCH_ROCKCHIP
+       bool "Support Rockchip SoCs"
+       select SUPPORT_SPL
+       select SPL
+       select OF_CONTROL
+       select CPU_V7
+       select DM
+
 endchoice
 
 source "arch/arm/mach-at91/Kconfig"
@@ -751,12 +669,12 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
+source "arch/arm/cpu/armv7/mx7/Kconfig"
+
 source "arch/arm/cpu/armv7/mx6/Kconfig"
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 
-source "arch/arm/mach-nomadik/Kconfig"
-
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
 source "arch/arm/cpu/armv7/omap4/Kconfig"
@@ -767,6 +685,8 @@ source "arch/arm/mach-orion5x/Kconfig"
 
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
+source "arch/arm/mach-rockchip/Kconfig"
+
 source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
 
 source "arch/arm/mach-socfpga/Kconfig"
@@ -775,8 +695,6 @@ source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"
 
-source "arch/arm/mach-versatile/Kconfig"
-
 source "arch/arm/mach-zynq/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
@@ -797,7 +715,6 @@ source "board/Marvell/gplugd/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
-source "board/balloon3/Kconfig"
 source "board/bluegiga/apx4devkit/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
@@ -806,10 +723,8 @@ source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/creative/xfi3/Kconfig"
-source "board/davedenx/qong/Kconfig"
 source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
-source "board/esg/ima3-mx53/Kconfig"
 source "board/freescale/ls2085a/Kconfig"
 source "board/freescale/ls2085aqds/Kconfig"
 source "board/freescale/ls2085ardb/Kconfig"
@@ -827,30 +742,18 @@ source "board/freescale/mx53evk/Kconfig"
 source "board/freescale/mx53loco/Kconfig"
 source "board/freescale/mx53smd/Kconfig"
 source "board/freescale/vf610twr/Kconfig"
-source "board/genesi/mx51_efikamx/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
-source "board/hale/tt01/Kconfig"
 source "board/hisilicon/hikey/Kconfig"
-source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
-source "board/jornada/Kconfig"
-source "board/karo/tx25/Kconfig"
-source "board/logicpd/imx27lite/Kconfig"
-source "board/logicpd/imx31_litekit/Kconfig"
 source "board/maxbcm/Kconfig"
 source "board/mpl/vcma9/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
-source "board/palmld/Kconfig"
-source "board/palmtc/Kconfig"
-source "board/palmtreo680/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
-source "board/pxa255_idp/Kconfig"
 source "board/samsung/smdk2410/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
-source "board/scb9328/Kconfig"
 source "board/schulercontrol/sc_sps_1/Kconfig"
 source "board/siemens/draco/Kconfig"
 source "board/siemens/pxm2/Kconfig"
@@ -861,12 +764,11 @@ source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
 source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
-source "board/st-ericsson/snowball/Kconfig"
-source "board/st-ericsson/u8500/Kconfig"
 source "board/st/stm32f429-discovery/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/zmx25/Kconfig"
+source "board/tcl/sl50/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
 source "board/birdland/bav335x/Kconfig"
@@ -875,15 +777,10 @@ source "board/ti/ti816x/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/toradex/colibri_vf/Kconfig"
-source "board/trizepsiv/Kconfig"
 source "board/technologic/ts4800/Kconfig"
-source "board/ttcontrol/vision2/Kconfig"
-source "board/vpac270/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
-source "board/xaeniax/Kconfig"
-source "board/zipitz2/Kconfig"
 
 source "arch/arm/Kconfig.debug"