kernel: Update to 3.7.7.

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index e2e484cf70c60c5a04934e5b667b683d48e6f8da..8f8ae75f43f518a2c97c4fbb5d2e08c06281f1c3 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -4,7 +4,6 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_NEED_MACH_IO_H=y
 
 #
 # General setup
@@ -17,6 +16,11 @@ CONFIG_BROKEN_ON_SMP=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_KTIME_SCALAR=y
 
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+
 #
 # RCU Subsystem
 #
@@ -27,32 +31,26 @@ CONFIG_PERF_USE_VMALLOC=y
 # Kernel Performance Events And Counters
 #
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_MODULES_USE_ELF_REL=y
 
 #
 # GCOV-based kernel profiling
 #
 CONFIG_LBDAF=y
 
-#
-# IO Schedulers
-#
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-
 #
 # System Type
 #
-# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_MULTIPLATFORM is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_VERSATILE=y
-# CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_CLPS711X 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_PRIMA2 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
@@ -64,18 +62,15 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MV78XX0 is not set
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_MMP is not set
 # 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_PICOXCELL is not set
-# CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_SHMOBILE is not set
@@ -91,9 +86,9 @@ CONFIG_ARCH_VERSATILE=y
 # 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_OMAP is not set
-# CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_VT8500 is not set
 # CONFIG_ARCH_ZYNQ is not set
 
@@ -148,7 +143,6 @@ CONFIG_ICST=y
 #
 CONFIG_ARM_AMBA=y
 CONFIG_PCI_SYSCALL=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 
@@ -167,6 +161,7 @@ CONFIG_AEABI=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
+CONFIG_HW_PERF_EVENTS=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
@@ -176,16 +171,15 @@ CONFIG_ZONE_DMA_FLAG=0
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_LEDS=y
-CONFIG_LEDS_CPU=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
 
 #
 # Boot options
 #
 CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ARM_APPENDED_DTB=y
@@ -231,6 +225,10 @@ CONFIG_BPF_JIT=y
 #
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CMA is not set
+
+#
+# Bus devices
+#
 CONFIG_DTC=y
 CONFIG_OF=y
 
@@ -298,6 +296,7 @@ CONFIG_SMSC911X=m
 #
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
 
 #
 # ISDN feature submodules
@@ -325,7 +324,7 @@ CONFIG_SERIO_AMBAKMI=m
 #
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HVC_DCC is not set
 CONFIG_HW_RANDOM_ATMEL=m
 CONFIG_HW_RANDOM_EXYNOS=m
@@ -358,6 +357,11 @@ CONFIG_OF_GPIO=y
 # CONFIG_GPIO_EM is not set
 # CONFIG_GPIO_PL061 is not set
 
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_ADNP=m
+
 #
 # 1-wire Slaves
 #
@@ -378,14 +382,10 @@ CONFIG_OF_GPIO=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
 
 #
-# Media drivers
-#
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-
-#
-# Webcam and/or TV USB devices
+# Media digital TV PCI Adapters
 #
 CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
@@ -421,6 +421,7 @@ CONFIG_FB_ARMCLCD=m
 #
 # Console display driver support
 #
+CONFIG_SND_COMPRESS_OFFLOAD=m
 # CONFIG_SND_ALI5451 is not set
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
@@ -444,6 +445,7 @@ CONFIG_MMC_SDHCI_PXAV2=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_PCI=m
 
 #
@@ -461,6 +463,7 @@ CONFIG_MMC_DW_PCI=m
 #
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
+CONFIG_RTC_DRV_SNVS=m
 
 #
 # DMA Devices
@@ -494,13 +497,13 @@ CONFIG_OF_IOMMU=y
 #
 # Kernel hacking
 #
-# CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_FTRACE_SYSCALLS is not set
 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_OC_ETM is not set
 
 #
@@ -508,6 +511,11 @@ CONFIG_OLD_MCOUNT=y
 #
 CONFIG_PAX_MEMORY_SANITIZE=y
 
+#
+# Memory Protections
+#
+CONFIG_GRKERNSEC_JIT_HARDEN=y
+
 #
 # Executable Protections
 #
@@ -518,6 +526,27 @@ CONFIG_PAX_MEMORY_SANITIZE=y
 #
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_GF128MUL=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_SHA1_ARM=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES_ARM=m
+
 #
 # Random Number Generation
 #