kernel: Update to 3.12.4.

[ipfire-3.x.git] / kernel / config-arm-generic

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 506dd53cbb5a590b4b39a8c21e613ec9f7d8a884..2e337033dd29846ea177c98838235daafe63a468 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -14,24 +14,31 @@ CONFIG_BROKEN_ON_SMP=y
 # IRQ subsystem
 #
 CONFIG_HARDIRQS_SW_RESEND=y
-# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set
 CONFIG_KTIME_SCALAR=y
 
+#
+# Timers subsystem
+#
+CONFIG_NO_HZ_IDLE=y
+
 #
 # CPU/Task time and stats accounting
 #
 CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
 
 #
 # RCU Subsystem
 #
 CONFIG_TINY_RCU=y
 # CONFIG_RCU_STALL_COMMON is not set
+CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_PERF_USE_VMALLOC=y
 
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
@@ -50,17 +57,12 @@ CONFIG_LBDAF=y
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_CNS3XXX is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@@ -73,7 +75,6 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
-# CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_SHMOBILE is not set
@@ -86,12 +87,9 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
+# CONFIG_PLAT_SPEAR is not set
 
 #
 # Versatile platform type
@@ -129,6 +127,8 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_NEED_KUSER_HELPERS=y
+CONFIG_KUSER_HELPERS=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_NR_BANKS=8
@@ -143,6 +143,12 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 
+#
+# PCI host controller drivers
+#
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+
 #
 # Kernel Features
 #
@@ -151,7 +157,9 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_ARCH_NR_GPIO=0
-CONFIG_HZ=100
+CONFIG_HZ_FIXED=0
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_500 is not set
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -185,11 +193,10 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_XIP_KERNEL is not set
-CONFIG_ATAGS_PROC=y
 CONFIG_AUTO_ZRELADDR=y
 
 #
-# CPU Power Management
+# CPU Idle
 #
 # CONFIG_CPU_IDLE is not set
 
@@ -219,11 +226,23 @@ CONFIG_BPF_JIT=y
 # Generic Driver Options
 #
 # CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CMA is not set
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+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
 
 #
 # Bus devices
 #
+CONFIG_ARM_CCI=y
 CONFIG_DTC=y
 CONFIG_OF=y
 
@@ -236,8 +255,6 @@ CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
@@ -266,6 +283,7 @@ CONFIG_OF_PCI_IRQ=y
 #
 # Distributed Switch Architecture drivers
 #
+CONFIG_ARC_EMAC=m
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
 CONFIG_CS89x0_PLATFORM=y
@@ -280,8 +298,6 @@ CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_SMC91X=m
 CONFIG_SMC911X=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
 # CONFIG_SUNGEM is not set
 
 #
@@ -296,6 +312,11 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 # CONFIG_ISDN_DRV_LOOP is not set
 
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_APMPOWER is not set
+
 #
 # Input Device Drivers
 #
@@ -305,6 +326,8 @@ CONFIG_INPUT_PWM_BEEPER=m
 # Hardware I/O ports
 #
 CONFIG_SERIO_AMBAKMI=m
+CONFIG_SERIO_APBPS2=m
+# CONFIG_SERIO_OLPC_APSP is not set
 
 #
 # Serial drivers
@@ -348,6 +371,8 @@ CONFIG_OF_GPIO=y
 #
 # CONFIG_GPIO_EM is not set
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_RCAR is not set
+# CONFIG_GPIO_GRGPIO is not set
 
 #
 # I2C GPIO expanders:
@@ -360,6 +385,12 @@ CONFIG_GPIO_ADNP=m
 # CONFIG_APM_POWER is not set
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_VEXPRESS=y
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_VEXPRESS=m
 
 #
 # Watchdog Device Drivers
@@ -376,7 +407,7 @@ CONFIG_POWER_RESET_RESTART=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_SYSCON is not set
+CONFIG_VEXPRESS_CONFIG=y
 
 #
 # Media digital TV PCI Adapters
@@ -385,6 +416,17 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
 # CONFIG_VIDEO_SH_MOBILE_CEU is not set
 
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+
+#
+# Graphics support
+#
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+
 #
 # I2C encoder or helper chips
 #
@@ -392,32 +434,25 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_RCAR_DU=m
+CONFIG_DRM_RCAR_LVDS=y
+CONFIG_DRM_SHMOBILE=m
 # CONFIG_DRM_TILCDC is not set
-CONFIG_DISPLAY_TIMING=y
-CONFIG_VIDEOMODE=y
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_BACKLIGHT is not set
 
 #
 # Frame buffer hardware drivers
 #
-CONFIG_FB_ARMCLCD=m
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_ARMCLCD is not set
 CONFIG_BACKLIGHT_PWM=m
 
 #
 # Console display driver support
 #
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 CONFIG_SND_COMPRESS_OFFLOAD=m
 # CONFIG_SND_ALI5451 is not set
 CONFIG_SND_ARM=y
@@ -426,13 +461,12 @@ CONFIG_SND_SOC=m
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SIMPLE_CARD=m
 
 #
-# OTG and related infrastructure
+# USB Physical Layer drivers
 #
-# CONFIG_USB_ULPI is not set
+CONFIG_USB_ULPI=y
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -441,7 +475,7 @@ CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_DW=m
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_MMC_DW_PLTFM=m
-# CONFIG_MMC_DW_EXYNOS is not set
+CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_PCI=m
 
 #
@@ -453,9 +487,6 @@ CONFIG_LEDS_PWM=m
 # iptables trigger is under Netfilter config (LED target)
 #
 # CONFIG_EDAC is not set
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 
 #
 # on-CPU RTC drivers
@@ -475,14 +506,22 @@ CONFIG_DMA_OF=y
 #
 # Hardware Spinlock drivers
 #
+CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_PL320_MBOX=y
 CONFIG_OF_IOMMU=y
 
 #
-# Magnetometer sensors
+# Analog to digital converters
+#
+# CONFIG_EXYNOS_ADC is not set
+
+#
+# Temperature sensors
 #
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_PCA9685=m
 CONFIG_IRQCHIP=y
 CONFIG_ARM_VIC=y
 CONFIG_ARM_VIC_NR=2
@@ -490,7 +529,7 @@ CONFIG_VERSATILE_FPGA_IRQ=y
 CONFIG_VERSATILE_FPGA_IRQ_NR=4
 
 #
-# Kernel hacking
+# Memory Debugging
 #
 # CONFIG_DEBUG_HIGHMEM is not set
 
@@ -498,11 +537,20 @@ CONFIG_VERSATILE_FPGA_IRQ_NR=4
 # RCU Debugging
 #
 # CONFIG_FTRACE_SYSCALLS is not set
+
+#
+# Runtime Testing
+#
 CONFIG_ARM_UNWIND=y
 CONFIG_OLD_MCOUNT=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_DEBUG_LL_INCLUDE="debug/pl01x.S"
+CONFIG_DEBUG_UART_PL01X=y
+# CONFIG_DEBUG_UART_8250 is not set
+CONFIG_DEBUG_UART_PHYS=0x101f1000
+CONFIG_DEBUG_UART_VIRT=0xf11f1000
+CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 # CONFIG_OC_ETM is not set
 
 #
@@ -557,4 +605,3 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 #
 CONFIG_AUDIT_GENERIC=y
 CONFIG_GENERIC_ATOMIC64=y
-# CONFIG_VIRTUALIZATION is not set