X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=blobdiff_plain;f=kernel%2Fconfig-armv5tel-default;h=ce625d1a67cfc23b6afdb75879045ddce7889b25;hp=66cd54a860b9ccd5b14df8f301a58042abda8378;hb=2db3b9b15645ff9dcb67ba55d9837faade0b7e69;hpb=ba06a041367a72f45224056d5495292cfde055d4

diff --git a/kernel/config-armv5tel-default b/kernel/config-armv5tel-default
index 66cd54a86..ce625d1a6 100644
--- a/kernel/config-armv5tel-default
+++ b/kernel/config-armv5tel-default
@@ -4,17 +4,11 @@
 #
 CONFIG_BROKEN_ON_SMP=y
 
-#
-# Timers subsystem
-#
-CONFIG_NO_HZ_IDLE=y
-
 #
 # CPU/Task time and stats accounting
 #
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
 
 #
 # RCU Subsystem
@@ -27,6 +21,7 @@ CONFIG_TINY_RCU=y
 #
 # CONFIG_ARCH_MULTIPLATFORM is not set
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_MACH_T5325=y
 
 #
 # Marvell Kirkwood Implementations
@@ -41,7 +36,6 @@ CONFIG_MACH_OPENRD_CLIENT=y
 CONFIG_MACH_OPENRD_ULTIMATE=y
 CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_T5325=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 
@@ -49,7 +43,6 @@ CONFIG_MACH_TS41X=y
 # Device tree entries
 #
 CONFIG_ARCH_KIRKWOOD_DT=y
-CONFIG_MACH_MV88F6281GTW_GE_DT=y
 CONFIG_PLAT_ORION_LEGACY=y
 
 #
@@ -69,37 +62,23 @@ CONFIG_CPU_USE_DOMAINS=y
 # Processor Features
 #
 CONFIG_NEED_KUSER_HELPERS=y
-CONFIG_CACHE_FEROCEON_L2=y
-# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5
 
 #
 # PCI host controller drivers
 #
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA is not set
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
+# CONFIG_PCIEPORTBUS is not set
 
 #
 # Kernel Features
 #
 CONFIG_ARCH_NR_GPIO=0
+# CONFIG_OABI_COMPAT is not set
 CONFIG_SPLIT_PTLOCK_CPUS=999999
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_UACCESS_WITH_MEMCPY=y
 
 #
 # Boot options
@@ -111,93 +90,35 @@ CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
 # CONFIG_XIP_KERNEL is not set
 
 #
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# ARM CPU frequency scaling drivers
-#
-CONFIG_ARM_KIRKWOOD_CPUFREQ=y
-
-#
-# CPU Idle
+# ARM CPU Idle Drivers
 #
+# CONFIG_ARM_KIRKWOOD_CPUIDLE is not set
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
-#
-# Bluetooth device drivers
-#
-CONFIG_RFKILL_REGULATOR=m
-
 #
 # Generic Driver Options
 #
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_REGMAP_MMIO=m
-
-#
-# Bus devices
-#
-# CONFIG_MTD is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Device Tree and Open Firmware support
 #
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_MG_DISK is not set
+CONFIG_VIRTIO_BLK=y
 
 #
 # Misc devices
 #
 # CONFIG_SRAM is not set
 
-#
-# SCSI Transports
-#
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_PLATFORM is not set
-
 #
 # Distributed Switch Architecture drivers
 #
-CONFIG_VORTEX=m
-CONFIG_PCMCIA_XIRCOM=m
+# CONFIG_VORTEX is not set
 
 #
-# MII PHY device drivers
+# USB Network Adapters
 #
-# CONFIG_PLIP is not set
+CONFIG_B43_SDIO=y
 
 #
 # ISDN feature submodules
@@ -205,118 +126,35 @@ CONFIG_PCMCIA_XIRCOM=m
 # CONFIG_ISDN_DRV_LOOP is not set
 
 #
-# Input device support
-#
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_ADP5520=m
-# CONFIG_KEYBOARD_SAMSUNG is not set
-CONFIG_KEYBOARD_STMPE=m
-CONFIG_KEYBOARD_TC3589X=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_INPUT_TWL4030_PWRBUTTON=m
-CONFIG_INPUT_TWL4030_VIBRA=m
-CONFIG_INPUT_TWL6040_VIBRA=m
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO_PARKBD is not set
-
-#
-# Non-8250 serial port support
+# PPS support
 #
-CONFIG_SERIAL_SCCNXP=m
-CONFIG_SERIAL_ARC=m
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
+CONFIG_PPS=m
 
 #
-# Multiplexer I2C Chip support
+# PTP clock support
 #
-CONFIG_I2C_ALGOBIT=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_MV64XXX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_PARPORT=m
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_PARPORT is not set
+CONFIG_PTP_1588_CLOCK=m
 
 #
 # Pin controllers
 #
-CONFIG_PINCTRL_SINGLE=m
-CONFIG_PINCTRL_PALMAS=y
+# CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_KIRKWOOD=y
 
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_GENERIC_PLATFORM=y
-
-#
-# I2C GPIO expanders:
-#
-# CONFIG_GPIO_TWL4030 is not set
-# CONFIG_GPIO_TWL6040 is not set
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MCP23S08=m
-
 #
 # 1-wire Slaves
 #
-CONFIG_MAX8925_POWER=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_WM8350_POWER=m
-CONFIG_BATTERY_88PM860X=m
-CONFIG_BATTERY_DA9030=m
-CONFIG_BATTERY_DA9052=m
-CONFIG_BATTERY_TWL4030_MADC=m
-CONFIG_CHARGER_88PM860X=m
-CONFIG_BATTERY_RX51=m
-CONFIG_CHARGER_TWL4030=m
-CONFIG_CHARGER_LP8788=m
-CONFIG_CHARGER_MAX8997=m
-CONFIG_CHARGER_MAX8998=m
-CONFIG_CHARGER_TPS65090=m
+# CONFIG_CHARGER_LP8788 is not set
 
 #
 # Native drivers
 #
-CONFIG_SENSORS_DA9052_ADC=m
-CONFIG_SENSORS_DA9055=m
-CONFIG_SENSORS_TWL4030_MADC=m
-CONFIG_SENSORS_WM831X=m
-CONFIG_SENSORS_WM8350=m
 CONFIG_KIRKWOOD_THERMAL=m
 
 #
-# Watchdog Device Drivers
+# Sonics Silicon Backplane
 #
-CONFIG_DA9052_WATCHDOG=m
-CONFIG_DA9055_WATCHDOG=m
-CONFIG_WM831X_WATCHDOG=m
-CONFIG_WM8350_WATCHDOG=m
-CONFIG_ORION_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
+CONFIG_SSB_SDIOHOST=y
 
 #
 # Multifunction device drivers
@@ -326,81 +164,62 @@ CONFIG_TWL4030_WATCHDOG=m
 #
 # STMicroelectronics STMPE Interface Drivers
 #
-# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_VX855=m
 CONFIG_REGULATOR_88PM8607=m
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_GPIO is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
+CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_LP872X=m
 CONFIG_REGULATOR_LP8788=m
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TWL4030=m
 
 #
-# Supported MMC/SDIO adapters
+# Media digital TV PCI Adapters
 #
-# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+CONFIG_VIDEO_CAFE_CCIC=m
 
 #
-# Graphics support
+# Camera sensor devices
 #
-CONFIG_DRM=m
-CONFIG_DRM_USB=m
+CONFIG_VIDEO_OV7670=m
 
 #
 # I2C encoder or helper chips
 #
-CONFIG_DRM_UDL=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_SYS_FOPS=m
 
 #
 # Frame buffer hardware drivers
 #
 CONFIG_LCD_PLATFORM=m
-# CONFIG_BACKLIGHT_PWM is not set
 
 #
 # Console display driver support
 #
-CONFIG_SND_MTS64=m
-CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_LX6464ES=m
-CONFIG_SND_KIRKWOOD_SOC=m
-CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
-CONFIG_SND_KIRKWOOD_SOC_T5325=m
-CONFIG_SND_SOC_ALC5623=m
-CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_MAESTRO3_INPUT=y
 
 #
-# USB Host Controller Drivers
+# HD-Audio
 #
-CONFIG_USB_EHCI_HCD_ORION=y
+CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
+CONFIG_SND_KIRKWOOD_SOC_T5325=m
 
 #
-# USB port drivers
+# CODEC drivers
 #
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_SND_SOC_ALC5623=m
 
 #
 # USB Physical Layer drivers
 #
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_SAMSUNG_USBPHY=m
-CONFIG_SAMSUNG_USB2PHY=m
-CONFIG_SAMSUNG_USB3PHY=m
 CONFIG_MMC=m
 
 #
@@ -411,59 +230,42 @@ CONFIG_MMC_BLOCK=m
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI=m
+CONFIG_MMC_RICOH_MMC=y
 
 #
 # LED drivers
 #
-CONFIG_LEDS_88PM860X=m
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_LP8788=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_WM8350=m
-CONFIG_LEDS_DA903X=m
-CONFIG_LEDS_DA9052=m
 CONFIG_LEDS_PWM=m
-CONFIG_LEDS_ADP5520=m
 CONFIG_LEDS_NS2=m
 CONFIG_LEDS_NETXBIG=m
-CONFIG_LEDS_MAX8997=m
 
 #
-# LED Triggers
+# DMA Devices
 #
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DW_DMAC_PCI=m
+CONFIG_MV_XOR=y
 
 #
-# I2C RTC drivers
+# DMA Clients
 #
-CONFIG_RTC_DRV_88PM860X=m
-CONFIG_RTC_DRV_88PM80X=m
-CONFIG_RTC_DRV_LP8788=m
-CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_DRV_MAX8925=m
-CONFIG_RTC_DRV_MAX8998=m
-CONFIG_RTC_DRV_MAX8997=m
-CONFIG_RTC_DRV_MAX77686=m
-CONFIG_RTC_DRV_PALMAS=m
-CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_TPS6586X=m
-CONFIG_RTC_DRV_TPS65910=m
-CONFIG_RTC_DRV_TPS80031=m
-CONFIG_RTC_DRV_RC5T583=m
+CONFIG_DMA_ENGINE_RAID=y
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_MF624=m
+CONFIG_VIRTIO=y
 
 #
-# Platform RTC drivers
+# Virtio drivers
 #
-CONFIG_RTC_DRV_DA9052=m
-CONFIG_RTC_DRV_DA9055=m
-CONFIG_RTC_DRV_WM831X=m
-CONFIG_RTC_DRV_WM8350=m
+CONFIG_VIRTIO_PCI=y
 
 #
-# Microsoft Hyper-V guest support
+# Android
 #
-# CONFIG_PANEL is not set
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
 
 #
 # Common Clock Framework
@@ -472,44 +274,35 @@ CONFIG_COMMON_CLK_WM831X=m
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_KIRKWOOD_CLK=y
 
-#
-# Hardware Spinlock drivers
-#
-CONFIG_ORION_TIMER=y
-
 #
 # Analog to digital converters
 #
-CONFIG_LP8788_ADC=y
+CONFIG_LP8788_ADC=m
 CONFIG_TWL6030_GPADC=m
 
 #
 # Temperature sensors
 #
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
+CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_LP3943=m
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
-CONFIG_ORION_IRQCHIP=y
 
 #
-# PHY Subsystem
+# Compile-time checks and compiler options
 #
-CONFIG_PHY_MVEBU_SATA=y
+CONFIG_FRAME_POINTER=y
 
 #
-# Lock Debugging (spinlocks, mutexes, etc...)
+# RCU Debugging
 #
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
+CONFIG_FUNCTION_GRAPH_TRACER=y
 
 #
 # Runtime Testing
 #
+CONFIG_OLD_MCOUNT=y
 CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
 CONFIG_DEBUG_UART_8250=y
 CONFIG_DEBUG_UART_PHYS=0xf1012000
@@ -519,8 +312,15 @@ CONFIG_DEBUG_UART_8250_SHIFT=2
 # CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
 CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+
 #
 # Library routines
 #
-CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_GENERIC_ATOMIC64=y
 # CONFIG_DDR is not set