commit 1a7f4473dd4d51736a8c99d7b5c050d88dcf7e9a
author Masahiro Yamada <yamada.masahiro@socionext.com> Fri May 08 13:07:12 2015 +0900
committer Arnd Bergmann <arnd@arndb.de> Tue May 12 16:58:05 2015 +0200
tree bc6c6e5908d4b4499689d1a71efd80768d5afb53
parent 4752e2076f574445cddb146df3d183394131585c

ARM: multi_v7_defconfig: enable UniPhier SoC family

Add UniPhier, a new citizen in the ARM multi platform.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

arch/arm/configs/multi_v7_defconfig

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index a9401b1..7bb516c 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -87,6 +87,7 @@
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_ARCH_UNIPHIER=y
 CONFIG_ARCH_U8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y