diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 14:30:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 14:30:21 -0700 |
| commit | 46dd1230ba92a92a1d1dea0006b9f1cb619b0dbf (patch) | |
| tree | 9d0bf8fedf261618d3d2a0a23a71b5b4032170a7 /arch/arm/configs/mvebu_v7_defconfig | |
| parent | a67f02c98e2471176eaf8a02f85e3b706ab9c5f2 (diff) | |
| parent | c1eed8d2ff67b18f3892016f40ad6899ac6cf477 (diff) | |
| download | talos-op-linux-46dd1230ba92a92a1d1dea0006b9f1cb619b0dbf.tar.gz talos-op-linux-46dd1230ba92a92a1d1dea0006b9f1cb619b0dbf.zip | |
Merge tag 'mvebu-defconfig-3.17-2' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge "ARM: mvebu: defconfig changes for v3.17 (round 2)" from Jason Cooper:
"Here's all the defconfig changes we have for mvebu this time around. The
big one is the removal of kirkwood_defconfig, corresponding to the
mach-kirkwood/ removal in mvebu/soc."
- mvebu
* Add appended_dtb support
* Add devtmpfs support
* Add 375 network driver
* Add cpuidle support
* Add cpufreq support
- kirkwood
* Remove kirkwood_defconfig
* tag 'mvebu-defconfig-3.17-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update mvebu_v7_defconfig with cpufreq support
ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig
ARM: Kirkwood: Remove kirkwood_defconfig
ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig
ARM: mvebu: add devtmpfs to mvebu_v5_defconfig
ARM: mvebu: add appended DTB support in mvebu_v5_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/mvebu_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index b0bfefa23902..fdfda1fa9521 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -29,6 +29,10 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_MVEBU_V7_CPUIDLE=y +CONFIG_CPU_FREQ=y +CONFIG_CPUFREQ_GENERIC=y CONFIG_VFP=y CONFIG_NET=y CONFIG_INET=y @@ -46,6 +50,7 @@ CONFIG_AHCI_MVEBU=y CONFIG_SATA_MV=y CONFIG_NETDEVICES=y CONFIG_MVNETA=y +CONFIG_MVPP2=y CONFIG_MARVELL_PHY=y CONFIG_MWIFIEX=y CONFIG_MWIFIEX_SDIO=y |
