diff options
| author | Olof Johansson <olof@lixom.net> | 2014-02-21 16:36:21 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-02-21 16:36:21 -0800 |
| commit | b9de5332bf4a2177a42304647f9534f717cfaa6f (patch) | |
| tree | 598c2e7e4c052da98c42cfbc3bafb2e715a97ce7 /arch/arm/configs | |
| parent | b392b489fe218337904beff00a776fb2bc77a0d6 (diff) | |
| parent | dd1d03afe8a0825d718f5d74225ad57978599a89 (diff) | |
| download | op-kernel-dev-b9de5332bf4a2177a42304647f9534f717cfaa6f.zip op-kernel-dev-b9de5332bf4a2177a42304647f9534f717cfaa6f.tar.gz | |
Merge tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu into next/boards
Merge "mvebu defconfig changes for v3.15" from Jason Cooper:
- dove
- remove UBI support
- enable watchdog
- mvebu
- rename mvebu_defconfig mvebu_v7_defconfig
- enable audio
- enable watchdog
- add Armada 375 and 38x
* tag 'mvebu-defconfig-3.15' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update defconfigs for Armada 375 and 38x
ARM: dove: Enable watchdog support in the defconfig
ARM: mvebu: Enable watchdog support in defconfig
ARM: mvebu: enable audio options in mvebu_defconfig
ARM: mvebu: rename mvebu_defconfig to mvebu_v7_defconfig
ARM: dove: Remove UBI support from defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/dove_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig (renamed from arch/arm/configs/mvebu_defconfig) | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 1101054..f159551 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -48,7 +48,6 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y -CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 @@ -80,6 +79,8 @@ CONFIG_SPI_ORION=y # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_DOVE_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ee69829..56549f1 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -9,6 +9,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_375=y +CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_MOBILE=y @@ -188,6 +190,8 @@ CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_LM90=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_SPI=y diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 0f4511d..62b6a37 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -10,6 +10,8 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_375=y +CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y # CONFIG_CACHE_L2X0 is not set # CONFIG_SWP_EMULATE is not set @@ -62,6 +64,13 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_KIRKWOOD_SOC=y +CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y |
