summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-07 07:38:39 -0400
committerTom Rini <trini@ti.com>2014-10-07 07:38:39 -0400
commitdd0204e48d05f41480743a798b94d5484b664639 (patch)
tree0dada741b0dc5b60dcc63ae0dfe783b6935e7eba /arch/arm/Kconfig
parent742de9076e8a8f44b77794b43e6175d86b897996 (diff)
parentc19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3efede2c55..43ba33a2af 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -521,6 +521,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"
@@ -549,6 +552,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"