diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-09 08:09:29 -0400 |
|---|---|---|
| committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-12-13 10:31:03 -0500 |
| commit | cb5c70c70385787f3b8df80e62e0f5ad82441dfb (patch) | |
| tree | 974e9e501585f8354286189ba89d214e7ebad842 /arch/arm/configs/multi_v7_defconfig | |
| parent | d68185d1aef9b8d3801ff656ec3089503119e936 (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 <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>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 |
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 | |||
| 7 | CONFIG_MACH_ARMADA_XP=y | 7 | CONFIG_MACH_ARMADA_XP=y |
| 8 | CONFIG_ARCH_BCM=y | 8 | CONFIG_ARCH_BCM=y |
| 9 | CONFIG_ARCH_BCM_MOBILE=y | 9 | CONFIG_ARCH_BCM_MOBILE=y |
| 10 | CONFIG_ARCH_BERLIN=y | ||
| 11 | CONFIG_MACH_BERLIN_BG2=y | ||
| 12 | CONFIG_MACH_BERLIN_BG2CD=y | ||
| 10 | CONFIG_GPIO_PCA953X=y | 13 | CONFIG_GPIO_PCA953X=y |
| 11 | CONFIG_ARCH_HIGHBANK=y | 14 | CONFIG_ARCH_HIGHBANK=y |
| 12 | CONFIG_ARCH_KEYSTONE=y | 15 | CONFIG_ARCH_KEYSTONE=y |