Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

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

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index b7b4954a3041a3805834e4830ed82ee859793d77..baa12a65caa678e67fbffbdb1e35cba710fbe28e 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -1,9 +1,4 @@
 
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_CC_STACKPROTECTOR is not set
-
 #
 # Processor type and features
 #
@@ -14,9 +9,14 @@ CONFIG_HIGHMEM4G=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 
 #
-# CPU Frequency scaling
+# Power management and ACPI options
+#
+CONFIG_PM_OPP=y
+
+#
+# CPU frequency scaling drivers
 #
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
+CONFIG_CPUFREQ_DT=m
 
 #
 # Bus options (PCI etc.)
@@ -36,7 +36,6 @@ CONFIG_OLPC_XO15_SCI=y
 #
 # Generic Driver Options
 #
-# CONFIG_SYS_HYPERVISOR is not set
 CONFIG_DMA_CMA=y
 
 #
@@ -65,19 +64,24 @@ CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
+# CONFIG_OF_OVERLAY is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_OF_PLATFORM is not set
 
 #
 # Distributed Switch Architecture drivers
 #
-CONFIG_AMD_XGBE=m
+CONFIG_ARC_EMAC_CORE=m
 # CONFIG_ARC_EMAC is not set
-CONFIG_BCMGENET=m
+CONFIG_EMAC_ROCKCHIP=m
 CONFIG_SYSTEMPORT=m
 
 #
 # MII PHY device drivers
 #
-CONFIG_AMD_XGBE_PHY=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -87,8 +91,9 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 CONFIG_KEYBOARD_STMPE=m
 CONFIG_KEYBOARD_OMAP4=m
-CONFIG_KEYBOARD_CAP1106=m
+CONFIG_KEYBOARD_CAP11XX=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
@@ -109,6 +114,7 @@ CONFIG_SERIO_APBPS2=m
 #
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 
 #
 # Multiplexer I2C Chip support
@@ -125,20 +131,18 @@ CONFIG_I2C_RK3X=m
 #
 # Pin controllers
 #
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_AS3722=y
-CONFIG_PINCTRL_BCM281XX=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_OF_GPIO=y
+CONFIG_GPIO_GENERIC=m
 
 #
 # Memory mapped GPIO drivers:
 #
-# CONFIG_GPIO_DWAPB is not set
+CONFIG_GPIO_74XX_MMIO=m
 # CONFIG_GPIO_SYSCON is not set
+# CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_GRGPIO is not set
 
 #
@@ -159,16 +163,14 @@ CONFIG_GPIO_CS5535=y
 # CONFIG_GPIO_MCP23S08 is not set
 
 #
-# MODULbus GPIO expanders:
-#
-# CONFIG_GPIO_BCM_KONA is not set
-
-#
-# 1-wire Slaves
+# USB GPIO expanders:
 #
 CONFIG_BATTERY_OLPC=y
 CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_LTC2952=y
+CONFIG_POWER_RESET_SYSCON=y
 
 #
 # Native drivers
@@ -179,6 +181,7 @@ CONFIG_SENSORS_PWM_FAN=m
 # ACPI drivers
 #
 # CONFIG_THERMAL_OF is not set
+CONFIG_CLOCK_THERMAL=y
 
 #
 # Watchdog Device Drivers
@@ -189,6 +192,10 @@ CONFIG_SENSORS_PWM_FAN=m
 # Multifunction device drivers
 #
 CONFIG_MFD_AS3722=y
+CONFIG_MFD_ATMEL_HLCDC=m
+CONFIG_MFD_HI6421_PMIC=m
+CONFIG_MFD_MAX77686=y
+CONFIG_MFD_RK808=y
 CONFIG_MFD_STMPE=y
 
 #
@@ -196,8 +203,25 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_MAX77802=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_TPS65218=m
 
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_PTN3460=m
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+
 #
 # Frame buffer hardware drivers
 #
@@ -208,27 +232,30 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_LP8788 is not set
 # CONFIG_BACKLIGHT_OT200 is not set
 
-#
-# USB Imaging devices
-#
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
-
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_MMC_SDHCI_F_SDH30=m
 
 #
 # LED drivers
 #
 CONFIG_LEDS_PWM=m
 
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_SYSCON=y
+
 #
 # I2C RTC drivers
 #
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_MAX77802=m
 
 #
 # on-CPU RTC drivers
@@ -250,26 +277,33 @@ CONFIG_DMA_OF=y
 #
 # Android
 #
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_XO1_RFKILL=m
 # CONFIG_XO15_EBOOK is not set
 
 #
 # Common Clock Framework
 #
+CONFIG_COMMON_CLK_MAX_GEN=y
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX77802=m
+CONFIG_COMMON_CLK_RK808=m
 # CONFIG_COMMON_CLK_SI5351 is not set
 CONFIG_COMMON_CLK_SI570=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_IPQ_GCC_806X=m
+CONFIG_IPQ_LCC_806X=m
 CONFIG_MSM_GCC_8660=m
 CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_LCC_8960=m
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_GCC_8974=m
 CONFIG_MSM_MMCC_8974=m
 
 #
-# Clock Source drivers
+# Generic IOMMU Pagetable Support
 #
 CONFIG_OF_IOMMU=y
 
@@ -278,14 +312,22 @@ CONFIG_OF_IOMMU=y
 #
 CONFIG_VF610_ADC=m
 
+#
+# Digital to analog converters
+#
+CONFIG_MAX5821=m
+
 #
 # Temperature sensors
 #
 CONFIG_PWM=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
@@ -294,15 +336,8 @@ CONFIG_IRQCHIP=y
 #
 # 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
 #