tegra: Replace 'Norrin' with 'Nyan-big' and fix typo

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 21cd1c8cdf4ed24890acb93f91da5791401ea4a9..2985e6e065975876f3a3c6d984745da5756b4d32 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -64,6 +64,7 @@ config SEMIHOSTING
 
 choice
        prompt "Target select"
+       optional
 
 config ARCH_AT91
        bool "Atmel AT91"
@@ -102,6 +103,11 @@ config KIRKWOOD
        bool "Marvell Kirkwood"
        select CPU_ARM926EJS
 
+config TARGET_DB_88F6820_GP
+       bool "Support DB-88F6820-GP"
+       select CPU_V7
+       select SUPPORT_SPL
+
 config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select CPU_V7
@@ -493,6 +499,7 @@ config TARGET_UDOO
 config TARGET_WANDBOARD
        bool "Support wandboard"
        select CPU_V7
+       select SUPPORT_SPL
 
 config TARGET_WARP
        bool "Support WaRP"
@@ -518,6 +525,10 @@ config TARGET_ARISTAINETOS
        bool "Support aristainetos"
        select CPU_V7
 
+config TARGET_ARISTAINETOS2
+       bool "Support aristainetos2"
+       select CPU_V7
+
 config TARGET_MX6QARM2
        bool "Support mx6qarm2"
        select CPU_V7
@@ -535,6 +546,11 @@ config TARGET_MX6SABRESD
        select DM
        select DM_THERMAL
 
+config TARGET_MX6CUBOXI
+       bool "Support Solid-run mx6 boards"
+       select CPU_V7
+       select SUPPORT_SPL
+
 config TARGET_MX6SLEVK
        bool "Support mx6slevk"
        select CPU_V7
@@ -551,10 +567,6 @@ config TARGET_GW_VENTANA
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_HUMMINGBOARD
-       bool "Support hummingboard"
-       select CPU_V7
-
 config TARGET_KOSAGI_NOVENA
        bool "Support Kosagi Novena"
        select CPU_V7
@@ -609,16 +621,8 @@ config TARGET_CM_FX6
        select DM_SERIAL
        select DM_GPIO
 
-config TARGET_SOCFPGA_ARRIA5
-       bool "Support socfpga_arria5"
-       select CPU_V7
-       select SUPPORT_SPL
-       select DM
-       select DM_SPI_FLASH
-       select DM_SPI
-
-config TARGET_SOCFPGA_CYCLONE5
-       bool "Support socfpga_cyclone5"
+config ARCH_SOCFPGA
+       bool "Altera SOCFPGA family"
        select CPU_V7
        select SUPPORT_SPL
        select DM
@@ -627,6 +631,11 @@ config TARGET_SOCFPGA_CYCLONE5
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
+       select DM
+       select DM_GPIO
+       select OF_CONTROL
+       select OF_SEPARATE
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SNOWBALL
        bool "Support snowball"
@@ -644,7 +653,7 @@ config TARGET_COLIBRI_VF
        bool "Support Colibri VF50/61"
        select CPU_V7
 
-config ZYNQ
+config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
@@ -777,7 +786,7 @@ config TARGET_JORNADA
        select CPU_SA1100
 
 config ARCH_UNIPHIER
-       bool "Panasonic UniPhier platform"
+       bool "Socionext UniPhier SoCs"
        select CPU_V7
        select SUPPORT_SPL
        select SPL
@@ -785,6 +794,9 @@ config ARCH_UNIPHIER
        select DM
        select DM_SERIAL
        select DM_I2C
+       help
+         Support for UniPhier SoC family developed by Socionext Inc.
+         (formerly, System LSI Business Division of Panasonic Corporation)
 
 config TARGET_STM32F429_DISCOVERY
        bool "Support STM32F429 Discovery"
@@ -826,6 +838,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
 
+source "arch/arm/mach-socfpga/Kconfig"
+
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"
@@ -845,9 +859,9 @@ source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
+source "board/Marvell/db-88f6820-gp/Kconfig"
 source "board/Marvell/db-mv784mp-gp/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
-source "board/altera/socfpga/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
@@ -922,7 +936,7 @@ source "board/siemens/draco/Kconfig"
 source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
 source "board/silica/pengwyn/Kconfig"
-source "board/solidrun/hummingboard/Kconfig"
+source "board/solidrun/mx6cuboxi/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"