aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hesselbarth <[email protected]>2013-09-09 14:09:29 +0200
committerSebastian Hesselbarth <[email protected]>2013-12-13 16:31:03 +0100
commitcb5c70c70385787f3b8df80e62e0f5ad82441dfb (patch)
tree974e9e501585f8354286189ba89d214e7ebad842
parentd68185d1aef9b8d3801ff656ec3089503119e936 (diff)
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 <[email protected]> Reviewed-by: Jason Cooper <[email protected]> Reviewed-by: Thomas Petazzoni <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]>
-rw-r--r--arch/arm/configs/multi_v7_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 4a5903e04827..cce415045668 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