kernel: Update to version 4.1.3

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

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index b8b88c394e0ea018cd2ff65261fe71912333435a..bce2c57822344b4d7ac25038ad17f1c644b48502 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -21,14 +21,12 @@ CONFIG_KERNEL_XZ=y
 #
 # IRQ subsystem
 #
-CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_FORCED_THREADING=y
 
 #
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
-CONFIG_UID16=y
 
 #
 # Kernel Performance Events And Counters
@@ -38,7 +36,6 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 
 #
@@ -52,7 +49,6 @@ CONFIG_LBDAF=y
 CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
@@ -71,7 +67,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_SHMOBILE_LEGACY is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -84,12 +79,12 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CPU Core family selection
 #
 # CONFIG_ARCH_MULTI_V6 is not set
+# CONFIG_ARCH_AT91 is not set
 
 #
 # Hisilicon platform type
 #
 CONFIG_ARCH_MXC=y
-# CONFIG_MXC_DEBUG_BOARD is not set
 
 #
 # OMAP Legacy Platform Data Board Type
@@ -108,7 +103,6 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_KUSER_HELPERS=y
 CONFIG_OUTER_CACHE=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
@@ -121,6 +115,7 @@ CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_PCIE_DW=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCIE_IPROC=m
 # CONFIG_PCCARD is not set
 
 #
@@ -159,6 +154,7 @@ CONFIG_AUTO_ZRELADDR=y
 # CPU frequency scaling drivers
 #
 CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_QORIQ_CPUFREQ=m
 
 #
 # At least one emulation must be selected
@@ -213,7 +209,6 @@ CONFIG_PATA_IMX=m
 #
 # Distributed Switch Architecture drivers
 #
-CONFIG_NET_CADENCE=y
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
 CONFIG_CS89x0_PLATFORM=y
@@ -224,6 +219,8 @@ CONFIG_FTMAC100=m
 CONFIG_FTGMAC100=m
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
 CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_HIX5HD2_GMAC=m
 CONFIG_HIP04_ETH=m
@@ -279,21 +276,23 @@ CONFIG_PINCTRL=y
 #
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_AS3722 is not set
+CONFIG_PINCTRL_AMD=y
 # CONFIG_PINCTRL_PALMAS is not set
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 
 #
-# Memory mapped GPIO drivers:
+# Memory mapped GPIO drivers
 #
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EM is not set
-# CONFIG_GPIO_ZEVIO is not set
 CONFIG_GPIO_MXC=y
+# CONFIG_GPIO_ZEVIO is not set
 
 #
-# USB GPIO expanders:
+# USB GPIO expanders
 #
 # CONFIG_APM_POWER is not set
 CONFIG_POWER_RESET_VERSATILE=y
@@ -301,7 +300,6 @@ CONFIG_POWER_RESET_VERSATILE=y
 #
 # Watchdog Device Drivers
 #
-CONFIG_CADENCE_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_IMX2_WDT=m
 
@@ -410,6 +408,7 @@ CONFIG_USB_MXS_PHY=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MMC_MXC=m
 
 #
@@ -441,10 +440,15 @@ CONFIG_NBPFAXI_DMA=m
 #
 # CONFIG_VFIO is not set
 
+#
+# Android
+#
+CONFIG_CHROME_PLATFORMS=y
+
 #
 # Common Clock Framework
 #
-# CONFIG_CLK_QORIQ is not set
+CONFIG_CLK_QORIQ=y
 
 #
 # Clock Source drivers
@@ -480,7 +484,6 @@ CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_IMX_UART_PORT=1
 # CONFIG_DEBUG_UART_8250 is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_CORESIGHT is not set
 
 #
 # PaX
@@ -527,22 +530,16 @@ CONFIG_GRKERNSEC_KERN_LOCKOUT=y
 #
 # CONFIG_GRKERNSEC_SETXID is not set
 
-#
-# Digest
-#
-CONFIG_CRYPTO_SHA1_ARM=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES_ARM=m
-
 #
 # Random Number Generation
 #
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
 
 #
 # Library routines