kernel: Update to 3.13.2.

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

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index 6f03829f25e5ba910558abe91589c1397bfd84c0..c3ae439d5f31a89ddde1851453eafa2f28bcfb11 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -3,11 +3,10 @@
 # Processor type and features
 #
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
-# CONFIG_IOMMU_HELPER is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT 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
 
 #
@@ -15,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
@@ -25,28 +28,60 @@ CONFIG_OLPC_XO15_SCI=y
 # Generic Driver Options
 #
 # CONFIG_SYS_HYPERVISOR 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_OF=y
 
 #
 # Device Tree and Open Firmware support
 #
 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_GPIO=y
-CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_ARC_EMAC is not set
+
+#
+# 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_MOUSE_PS2_OLPC=y
 
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO_APBPS2=m
+# CONFIG_SERIO_OLPC_APSP is not set
+
 #
 # Serial drivers
 #
@@ -55,7 +90,8 @@ CONFIG_MOUSE_PS2_OLPC=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_OF_PLATFORM=y
+# CONFIG_SERIAL_XILINX_PS_UART is not set
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
@@ -63,15 +99,38 @@ CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_PCI=y
 
+#
+# Pin controllers
+#
+# CONFIG_PINCTRL_SINGLE is not set
+CONFIG_OF_GPIO=y
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GRGPIO is not set
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_ADNP=m
+
 #
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=y
+# CONFIG_GPIO_SODAVILLE is not set
+
+#
+# MODULbus GPIO expanders:
+#
+# CONFIG_GPIO_BCM_KONA is not set
 
 #
 # 1-wire Slaves
 #
 CONFIG_BATTERY_OLPC=y
+CONFIG_POWER_RESET_GPIO=y
 
 #
 # Multifunction device drivers
@@ -79,28 +138,69 @@ CONFIG_BATTERY_OLPC=y
 CONFIG_MFD_CORE=y
 
 #
-# Graphics support
+# Frame buffer hardware drivers
+#
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_OT200 is not set
+
+#
+# Console display driver support
 #
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_SSD1307 is not set
 
 #
 # LED drivers
 #
-# CONFIG_LEDS_NET5501 is not set
+CONFIG_LEDS_PWM=m
 
 #
-# Virtio drivers
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SNVS=m
+
+#
+# DMA Devices
+#
+CONFIG_DMA_OF=y
+
+#
+# Microsoft Hyper-V guest support
 #
 # CONFIG_FB_OLPC_DCON is not set
 
 #
-# Speakup console speech
+# Android
 #
 CONFIG_XO1_RFKILL=m
 
+#
+# Common Clock Framework
+#
+# CONFIG_COMMON_CLK_SI5351 is not set
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_OF_IOMMU=y
+
+#
+# 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
+
+#
+# PHY Subsystem
+#
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+
 #
 # Non-executable pages
 #
@@ -111,6 +211,7 @@ CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
 # Miscellaneous hardening features
 #
 CONFIG_PAX_MEMORY_UDEREF=y
+CONFIG_PAX_CONSTIFY_PLUGIN=y
 
 #
 # Random Number Generation