Merge remote-tracking branch 'u-boot-imx/master'

[karo-tx-uboot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8face21d56ef87ade9f703b5ac6d5430d0f63485..7365fca52635dbb9165dc3b6c982df50816aaafb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -465,6 +465,7 @@ config ZYNQ
 config TEGRA
        bool "NVIDIA Tegra"
        select SPL
+       select OF_CONTROL if !SPL_BUILD
 
 config TARGET_VEXPRESS_AEMV8A
        bool "Support vexpress_aemv8a"
@@ -523,6 +524,9 @@ config TARGET_COLIBRI_PXA270
 config TARGET_JORNADA
        bool "Support jornada"
 
+config ARCH_UNIPHIER
+       bool "Panasonic UniPhier platform"
+
 endchoice
 
 source "arch/arm/cpu/armv8/Kconfig"
@@ -551,6 +555,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
 
+source "arch/arm/cpu/armv7/uniphier/Kconfig"
+
 source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
 
 source "arch/arm/cpu/armv7/zynq/Kconfig"