diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-03-24 18:10:58 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-03-24 18:10:58 +0000 |
| commit | cfeb4721e8744f5bb2e8719ab253c5b4471b89b0 (patch) | |
| tree | 37c27e156865c48ab9a4f41cc9ddfe43b07c1437 /config-armv7 | |
| parent | e47265e6198c6db07eaa5143e1e129d4b6a41f63 (diff) | |
| download | kernel-cfeb4721e8744f5bb2e8719ab253c5b4471b89b0.tar.gz kernel-cfeb4721e8744f5bb2e8719ab253c5b4471b89b0.tar.xz kernel-cfeb4721e8744f5bb2e8719ab253c5b4471b89b0.zip | |
Update ARM config for OMAP/mvebu/lpae
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/config-armv7 b/config-armv7 index 7142ed965..ffaf72eea 100644 --- a/config-armv7 +++ b/config-armv7 @@ -31,6 +31,7 @@ CONFIG_CPU_IDLE_CALXEDA=y CONFIG_EDAC_HIGHBANK_MC=m CONFIG_EDAC_HIGHBANK_L2=m CONFIG_SATA_HIGHBANK=m +CONFIG_ARM_HIGHBANK_CPUFREQ=m # versatile CONFIG_VEXPRESS_CONFIG=y @@ -48,10 +49,6 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y CONFIG_MACH_ARMADA_370_XP=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y -CONFIG_ARCH_DOVE=y -# CONFIG_MACH_DOVE_DB is not set -# CONFIG_MACH_CM_A510 is not set -CONFIG_MACH_DOVE_DT=y CONFIG_CACHE_TAUROS2=y CONFIG_MV_XOR=y @@ -73,8 +70,6 @@ CONFIG_MVNETA=m CONFIG_GPIO_MVEBU=y CONFIG_MVEBU_CLK_CORE=y CONFIG_MVEBU_CLK_GATING=y -CONFIG_DOVE_THERMAL=m -CONFIG_MMC_SDHCI_DOVE=m CONFIG_MMC_MVSDIO=m # omap @@ -141,13 +136,18 @@ CONFIG_REGULATOR_TWL4030=y CONFIG_BACKLIGHT_PANDORA=m CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_OHCI_HCD_OMAP3=y +CONFIG_OMAP_CONTROL_USB=m +CONFIG_NOP_USB_XCEIV=m +CONFIG_TWL4030_USB=m +CONFIG_TWL6030_USB=m +CONFIG_USB_MUSB_AM35X=m CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_RTC_DRV_MAX8907=m CONFIG_RTC_DRV_TWL92330=y CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_OMAP=y -CONFIG_DMA_OMAP=m +CONFIG_DMA_OMAP=y CONFIG_OMAP_IOVMM=m CONFIG_HWSPINLOCK_OMAP=m CONFIG_OMAP_IOMMU=y @@ -181,7 +181,7 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_HW_RANDOM_OMAP=m -CONFIG_DRM_TILCDC=m +# CONFIG_DRM_TILCDC is not set CONFIG_DRM_OMAP=m CONFIG_DRM_OMAP_NUM_CRTCS=2 CONFIG_OMAP2_VRAM=y @@ -383,12 +383,10 @@ CONFIG_REGULATOR_LP8755=m # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EGALAX is not set # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -CONFIG_VIRTUALIZATION=y + +# CONFIG_VIRTUALIZATION is not set # CONFIG_CHARGER_MANAGER is not set # CONFIG_POWER_RESET_QNAP is not set # CONFIG_POWER_RESET_RESTART is not set # CONFIG_ARM_PSCI is not set -# CONFIG_ARM_HIGHBANK_CPUFREQ is not set -# CONFIG_RFKILL_REGULATOR is not set - -CONFIG_XZ_DEC_ARM=y +# CONFIG_OMAP2_DSS_DEBUG is not set |