X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=kernel%2Fconfig-i686-legacy;h=c3ae439d5f31a89ddde1851453eafa2f28bcfb11;hb=302e8df8ef41cb06c3d9f4b4f785797434f4a1de;hp=cc560c91eb36e826d7ea0792d2b8493be524ed88;hpb=7197eb6d833493a2a8189595b3d668aaeafe515c;p=people%2Fms%2Fipfire-3.x.git

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index cc560c91e..c3ae439d5 100644
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -5,6 +5,8 @@
 # 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
@@ -22,7 +28,18 @@ CONFIG_OLPC_XO15_SCI=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
@@ -37,13 +54,16 @@ CONFIG_PROC_DEVICETREE=y
 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
 
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_ARC_EMAC is not set
+
 #
 # MII PHY device drivers
 #
@@ -55,7 +75,12 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 # Input Device Drivers
 #
 CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_INPUT_PWM_BEEPER=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO_APBPS2=m
+# CONFIG_SERIO_OLPC_APSP is not set
 
 #
 # Serial drivers
@@ -75,10 +100,16 @@ CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_PCI=y
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+# 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:
 #
@@ -90,6 +121,11 @@ CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_CS5535=y
 # CONFIG_GPIO_SODAVILLE is not set
 
+#
+# MODULbus GPIO expanders:
+#
+# CONFIG_GPIO_BCM_KONA is not set
+
 #
 # 1-wire Slaves
 #
@@ -100,15 +136,6 @@ CONFIG_POWER_RESET_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
-# CONFIG_MFD_SYSCON is not set
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
 
 #
 # Frame buffer hardware drivers
@@ -119,13 +146,23 @@ CONFIG_BACKLIGHT_PWM=m
 #
 # Console display driver support
 #
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
+
+#
+# LED drivers
+#
+CONFIG_LEDS_PWM=m
 
 #
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_SNVS=m
 
+#
+# DMA Devices
+#
+CONFIG_DMA_OF=y
+
 #
 # Microsoft Hyper-V guest support
 #
@@ -136,20 +173,45 @@ CONFIG_RTC_DRV_SNVS=m
 #
 CONFIG_XO1_RFKILL=m
 
+#
+# Common Clock Framework
+#
+# CONFIG_COMMON_CLK_SI5351 is not set
+
 #
 # Hardware Spinlock drivers
 #
 CONFIG_OF_IOMMU=y
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# 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
+#
+CONFIG_PAX_KERNEXEC=y
+CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
 
 #
 # Miscellaneous hardening features
 #
 CONFIG_PAX_MEMORY_UDEREF=y
+CONFIG_PAX_CONSTIFY_PLUGIN=y
 
 #
 # Random Number Generation