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-arm-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-arm-generic')
| -rw-r--r-- | config-arm-generic | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic index 0afd4451b..af9916654 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -74,6 +74,8 @@ CONFIG_OF_MTD=y CONFIG_OF_NET=y CONFIG_OF_PCI_IRQ=m CONFIG_OF_PCI=m +CONFIG_OF_RESERVED_MEM=y +CONFIG_PATA_OF_PLATFORM=m # CONFIG_OF_SELFTEST is not set CONFIG_SERIAL_OF_PLATFORM=y CONFIG_THERMAL_OF=y @@ -102,6 +104,7 @@ CONFIG_MTD_PHYSMAP_OF=m CONFIG_GPIO_DEVRES=y CONFIG_GPIO_GENERIC=m CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_WATCHDOG=m CONFIG_GPIOLIB=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y @@ -111,10 +114,10 @@ CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_RESTART=y #i2c +CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_GPIO=m CONFIG_I2C_MUX=m -# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set CONFIG_I2C_MUX_GPIO=m CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_MUX_PCA9541=m @@ -135,6 +138,18 @@ CONFIG_SMC911X=m CONFIG_CPU_THERMAL=y CONFIG_THERMAL_GOV_USER_SPACE=y +# Contiguous Memory Allocator +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_CRYPTO_TEST is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_XEN is not set |