ARM: dts: UniPhier: re-license device tree files under GPLv2+/X11

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cee31265abc17a8a8d0fc5ffcaf7d28ec2017fed..08292353336ebb2a070128178dbe1a99ac90b6cc 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"
@@ -345,8 +346,13 @@ config TARGET_DRACO
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_DXR2
-       bool "Support dxr2"
+config TARGET_THUBAN
+       bool "Support thuban"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_RASTABAN
+       bool "Support rastaban"
        select CPU_V7
        select SUPPORT_SPL
 
@@ -368,6 +374,14 @@ config TARGET_PENGWYN
        select DM_SERIAL
        select DM_GPIO
 
+config TARGET_AM335X_BALTOS
+       bool "Support am335x_baltos"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
 config TARGET_AM335X_EVM
        bool "Support am335x_evm"
        select CPU_V7
@@ -498,6 +512,7 @@ config TARGET_UDOO
 config TARGET_WANDBOARD
        bool "Support wandboard"
        select CPU_V7
+       select SUPPORT_SPL
 
 config TARGET_WARP
        bool "Support WaRP"
@@ -523,6 +538,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
@@ -561,10 +580,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
@@ -666,6 +681,7 @@ config TEGRA
        select SUPPORT_SPL
        select SPL
        select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select CPU_V7
        select DM
        select DM_SPI_FLASH
@@ -784,7 +800,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
@@ -792,6 +808,10 @@ config ARCH_UNIPHIER
        select DM
        select DM_SERIAL
        select DM_I2C
+       select SPL_DISABLE_OF_CONTROL
+       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"
@@ -932,7 +952,6 @@ source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
 source "board/silica/pengwyn/Kconfig"
 source "board/solidrun/mx6cuboxi/Kconfig"
-source "board/solidrun/hummingboard/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
@@ -958,6 +977,7 @@ source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
 source "board/vpac270/Kconfig"
+source "board/vscom/baltos/Kconfig"
 source "board/wandboard/Kconfig"
 source "board/warp/Kconfig"
 source "board/woodburn/Kconfig"