diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2014-02-09 20:13:37 +0000 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2014-02-09 20:13:37 +0000 |
commit | fa7d75e6c00a803fb0e1406808213900cb877ab2 (patch) | |
tree | a69cd6a366373dea758f22928b6f195ccfbd9225 /config-armv7-generic | |
parent | c42a14b84262d20a73f01272c4070d4aac98734c (diff) | |
download | kernel-fa7d75e6c00a803fb0e1406808213900cb877ab2.tar.gz kernel-fa7d75e6c00a803fb0e1406808213900cb877ab2.tar.xz kernel-fa7d75e6c00a803fb0e1406808213900cb877ab2.zip |
Enable CMA on aarch64, Disable KVM temporarily on aarch64, Minor ARM config updates and cleanups
Diffstat (limited to 'config-armv7-generic')
-rw-r--r-- | config-armv7-generic | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index 693cfc28a..a81ca01f4 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -151,7 +151,6 @@ CONFIG_RTC_DRV_PL031=y CONFIG_PL330_DMA=m CONFIG_AMBA_PL08X=y -CONFIG_ARM_SP805_WATCHDOG=m CONFIG_GPIO_PL061=y CONFIG_PL320_MBOX=y @@ -517,18 +516,6 @@ CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m CONFIG_BMP085_SPI=m -# Contiguous Memory Allocator -CONFIG_OF_RESERVED_MEM=y -CONFIG_CMA=y -CONFIG_DMA_CMA=y -# CONFIG_CMA_DEBUG is not set -CONFIG_CMA_SIZE_MBYTES=16 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_AREAS=7 CONFIG_SRAM=y # Ethernet @@ -576,11 +563,10 @@ CONFIG_KEYBOARD_CROS_EC=m # Should be in generic CONFIG_BPF_JIT=y + # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_MICROCHIP is not set - # CONFIG_PATA_PLATFORM is not set - # CONFIG_DRM_EXYNOS is not set # CONFIG_DRM_TILCDC is not set # CONFIG_DRM_IMX is not set @@ -609,6 +595,8 @@ CONFIG_BPF_JIT=y # CONFIG_SPI_TOPCLIFF_PCH is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_FSL_DSPI is not set +# CONFIG_FB_XILINX is not set +# CONFIG_USB_S3C_HSOTG is not set # these modules all fail with missing __bad_udelay # http://www.spinics.net/lists/arm/msg15615.html provides some background @@ -630,8 +618,5 @@ CONFIG_BPF_JIT=y # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_PINCTRL is not set -# CONFIG_ARM_DT_BL_CPUFREQ is not set - -# FIX ME -# CONFIG_FB_XILINX is not set -# CONFIG_USB_S3C_HSOTG is not set +# CONFIG_DMADEVICES_VDEBUG is not set +# CONFIG_DMADEVICES_DEBUG is not set |