kernel: Update to version 4.2

[ipfire-3.x.git] / kernel / config-i686-legacy

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index cc560c91eb36e826d7ea0792d2b8493be524ed88..b6253f5ce34963d4a3ec7ef11978baf7e412ef4a 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -1,10 +1,12 @@
+CONFIG_PGTABLE_LEVELS=2
 
 #
 # Processor type and features
 #
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 
 #
@@ -12,6 +14,10 @@ CONFIG_HIGHMEM4G=y
 #
 # CONFIG_PCI_GOOLPC is not set
 CONFIG_PCI_OLPC=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_OLPC=y
 CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO1_RTC=y
@@ -21,42 +27,39 @@ CONFIG_OLPC_XO15_SCI=y
 #
 # Generic Driver Options
 #
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CMA is not set
+CONFIG_DMA_CMA=y
 
 #
-# Bus devices
+# Default contiguous memory area size:
 #
-CONFIG_OF=y
+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
 
 #
-# Device Tree and Open Firmware support
+# Bus devices
 #
-CONFIG_PROC_DEVICETREE=y
-# CONFIG_OF_SELFTEST is not set
 CONFIG_OF_PROMTREE=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
-CONFIG_OF_PCI_IRQ=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
 
 #
 # Input Device Drivers
 #
+CONFIG_KEYBOARD_STMPE=m
+CONFIG_KEYBOARD_TC3589X=m
 CONFIG_MOUSE_PS2_OLPC=y
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+# CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_PWM_BEEPER=m
 
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO_OLPC_APSP is not set
+
 #
 # Serial drivers
 #
@@ -66,65 +69,55 @@ CONFIG_INPUT_PWM_BEEPER=m
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SERIAL_XILINX_PS_UART is not set
 
 #
-# I2C system bus drivers (mostly embedded / system-on-chip)
+# Pin controllers
 #
-CONFIG_I2C_PXA=m
-CONFIG_I2C_PXA_PCI=y
+CONFIG_PINCTRL_AS3722=y
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+# MFD GPIO expanders
 #
-CONFIG_OF_GPIO=y
+CONFIG_GPIO_CS5535=y
 
 #
-# I2C GPIO expanders:
+# USB GPIO expanders
 #
-CONFIG_GPIO_ADNP=m
+CONFIG_BATTERY_OLPC=y
+CONFIG_POWER_RESET_AS3722=y
 
 #
-# PCI GPIO expanders:
+# Native drivers
 #
-CONFIG_GPIO_CS5535=y
-# CONFIG_GPIO_SODAVILLE is not set
+CONFIG_SENSORS_PWM_FAN=m
 
 #
-# 1-wire Slaves
+# ACPI drivers
 #
-CONFIG_BATTERY_OLPC=y
-CONFIG_POWER_RESET_GPIO=y
+# CONFIG_THERMAL_OF is not set
 
 #
 # Multifunction device drivers
 #
-CONFIG_MFD_CORE=y
-# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_RK808=y
 
 #
-# I2C encoder or helper chips
+# STMicroelectronics STMPE Interface Drivers
 #
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
+CONFIG_REGULATOR_PWM=m
 
 #
 # Frame buffer hardware drivers
 #
 CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_OT200 is not set
-
-#
-# Console display driver support
-#
-CONFIG_FB_SSD1307=m
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_LP8788 is not set
 
 #
-# on-CPU RTC drivers
+# LED drivers
 #
-CONFIG_RTC_DRV_SNVS=m
+CONFIG_LEDS_PWM=m
 
 #
 # Microsoft Hyper-V guest support
@@ -135,21 +128,28 @@ CONFIG_RTC_DRV_SNVS=m
 # Android
 #
 CONFIG_XO1_RFKILL=m
+# CONFIG_XO15_EBOOK is not set
 
 #
-# Hardware Spinlock drivers
+# Common Clock Framework
 #
-CONFIG_OF_IOMMU=y
+# CONFIG_COMMON_CLK_SI5351 is not set
+CONFIG_COMMON_CLK_PWM=m
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# Temperature sensors
 #
 CONFIG_PWM=y
-
-#
-# Miscellaneous hardening features
-#
-CONFIG_PAX_MEMORY_UDEREF=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_FSL_FTM=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
 
 #
 # Random Number Generation