diff options
| -rw-r--r-- | config-arm-generic | 17 | ||||
| -rw-r--r-- | config-arm64 | 3 | ||||
| -rw-r--r-- | config-armv7-generic | 25 | ||||
| -rw-r--r-- | kernel.spec | 5 |
4 files changed, 27 insertions, 23 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 diff --git a/config-arm64 b/config-arm64 index 6dede41a7..dc0f6d44f 100644 --- a/config-arm64 +++ b/config-arm64 @@ -12,7 +12,6 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_REQUIRE_GPIOLIB=y # CONFIG_ARM64_64K_PAGES is not set CONFIG_COMPAT=y -# CONFIG_ARM_DT_BL_CPUFREQ is not set CONFIG_ARM_SMMU=y CONFIG_BCMA_POSSIBLE=y @@ -42,7 +41,7 @@ CONFIG_HAVE_NET_DSA=y CONFIG_HVC_DRIVER=y CONFIG_HZ=100 -CONFIG_KVM=y +# CONFIG_KVM is not set CONFIG_KVM_ARM_MAX_VCPUS=8 CONFIG_LOG_BUF_SHIFT=14 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 diff --git a/kernel.spec b/kernel.spec index 77525d4a1..8aa861d44 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2055,6 +2055,11 @@ fi # ||----w | # || || %changelog +* Sun Feb 9 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Enable CMA on aarch64 +- Disable KVM temporarily on aarch64 +- Minor ARM config updates and cleanups + * Sun Feb 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc1.git5.1.1 - Linux v3.14-rc1-182-g4944790 |