summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-08 07:07:12 +0300
committerArnd Bergmann <arnd@arndb.de>2015-05-12 17:58:05 +0300
commit1a7f4473dd4d51736a8c99d7b5c050d88dcf7e9a (patch)
treebc6c6e5908d4b4499689d1a71efd80768d5afb53 /arch
parent4752e2076f574445cddb146df3d183394131585c (diff)
downloadlinux-1a7f4473dd4d51736a8c99d7b5c050d88dcf7e9a.tar.xz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index a9401b188879..7bb516cd6c14 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -87,6 +87,7 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
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