mvebu defconfig changes for v3.15

- dove
     - remove UBI support
     - enable watchdog
 
  - mvebu
     - rename mvebu_defconfig mvebu_v7_defconfig
     - enable audio
     - enable watchdog
     - add Armada 375 and 38x
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTA40rAAoJEP45WPkGe8Znf1MP/Akd4eyPVtNiuq8/ZR7wqAbG
 QrEYz+SbRD4pwpEAiYG5TZW2F+kcWd/WElt2c9eJ6z47no/eg46an81XEwNxxcTT
 KQoR1M/e2elOThN1Spel17vbqjyPMz+/vDZdCooClgpbXfvBbfrfgEPqnIYkMSZQ
 je4dy5BIAcG5nZUGMeBlfq4GgSwPMa+ZQ2EdBuMdaDReXhHB2DR2Ubz7LEAaAsEg
 s1FqmZE919z3bn57DriCgdZo0N/sna1JDNSy8rv6oeyP401EpvWa9xit5ctYNLld
 R/KyoX21Yo2YUbanUTrX1T2OTetKAd41FaI9YuGPjZ6mFX7AYQsjSk26cHLuiZni
 DWFzlrMb1qnXqvSKIAxbUAbnBMlp//UumdYfjAac1yaKhZDWD4yyWwkEGpWTXy+s
 CEY/IznZrpW8csUJnw1zunDmZgHnt0sETdhN49HVB6bhk9MSHnRUEbE5x5bo+E3S
 Cs2L+EggF+/oqBmb1bxz1Ji9p7qV4hT6Xkg0mpMVIBrFv34aFVAYrJ/jWxNhRaUq
 DTdiOVjeWUn2MTAm4MR9k0cMZFpfMcfo7CfTnp412EGkd0JE0AF41ggQ9F/n921c
 RmZ0TBgiggy4xenjSAVUidwWn2xplKJGuvSE3VCJReIGd1tgSet06z95bt8nCCmo
 FUwtxhB6CRtJj6vovZjR
 =r+73
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2014-02-21 16:36:21 -08:00
commit b9de5332bf
3 changed files with 15 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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