From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date: Mon, 9 Sep 2013 12:09:29 +0000 (+0200)
Subject: ARM: add Marvell Berlin SoCs to multi_v7_defconfig
X-Git-Tag: upstream/snapshot3+hdmi~3591^2~23^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb5c70c70385787f3b8df80e62e0f5ad82441dfb;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ARM: add Marvell Berlin SoCs to multi_v7_defconfig

This adds the Marvell Berlin SoC family, Marvell Armada 1500
(BG2), and Marvell Armada 1500-mini (BG2CD) to the multi_v7_defconfig.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Reviewed-by: Jason Cooper <jason@lakedaemon.net>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 4a5903e..cce4150 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -7,6 +7,9 @@ CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM_MOBILE=y
+CONFIG_ARCH_BERLIN=y
+CONFIG_MACH_BERLIN_BG2=y
+CONFIG_MACH_BERLIN_BG2CD=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_KEYSTONE=y