From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9bf77c63d07566141a318b206f7766d445efd8b0 Date: Fri, 28 Mar 2014 14:10:22 +0100 Message-ID: <20140328131126.9031621008@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2966140961972779892==" List-Id: --===============2966140961972779892== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 9bf77c63d07566141a318b206f7766d445efd8b0 (commit) from 2e358974082686a65ce692731183f9d47e655a7d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9bf77c63d07566141a318b206f7766d445efd8b0 Author: Michael Tremer Date: Tue Mar 18 16:01:22 2014 +0000 kernel: Make configuration management more slink and usable. ----------------------------------------------------------------------- Summary of changes: kernel/config-arm-generic | 63 +++++ ...g-armv5tel-kirkwood =3D> config-armv5tel-default} | 83 ------ kernel/config-armv7hl-default | 212 +++++++++++--- kernel/config-armv7hl-generic | 311 -------------------= -- kernel/config-armv7hl-lpae | 1 - kernel/config-generic | 10 + kernel/config-x86-generic | 13 - kernel/kernel.nm | 28 +- kernel/scripts/configure | 40 +-- 9 files changed, 257 insertions(+), 504 deletions(-) rename kernel/{config-armv5tel-kirkwood =3D> config-armv5tel-default} (83%) delete mode 100644 kernel/config-armv7hl-generic Difference in files: diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 319f296..5b3431a 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -1,6 +1,7 @@ CONFIG_ARM=3Dy CONFIG_SYS_SUPPORTS_APM_EMULATION=3Dy CONFIG_RWSEM_GENERIC_SPINLOCK=3Dy +CONFIG_ARCH_HAS_CPUFREQ=3Dy CONFIG_VECTORS_BASE=3D0xffff0000 CONFIG_ARM_PATCH_PHYS_VIRT=3Dy =20 @@ -8,6 +9,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=3Dy # IRQ subsystem # CONFIG_HARDIRQS_SW_RESEND=3Dy +CONFIG_GENERIC_IRQ_CHIP=3Dy CONFIG_KTIME_SCALAR=3Dy =20 # @@ -35,6 +37,7 @@ CONFIG_LBDAF=3Dy # # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_GEMINI is not set @@ -73,6 +76,11 @@ CONFIG_LBDAF=3Dy # CONFIG_PLAT_SPEAR is not set =20 # +# Versatile Express platform type +# +CONFIG_PLAT_ORION=3Dy + +# # Processor Type # CONFIG_CPU_CP15=3Dy @@ -81,9 +89,12 @@ CONFIG_CPU_CP15_MMU=3Dy # # Processor Features # +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARM_THUMB=3Dy # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_KUSER_HELPERS=3Dy +CONFIG_OUTER_CACHE=3Dy CONFIG_ARM_NR_BANKS=3D8 CONFIG_MULTI_IRQ_HANDLER=3Dy =20 @@ -97,6 +108,7 @@ CONFIG_PCI_SYSCALL=3Dy # # PCI host controller drivers # +CONFIG_PCI_MVEBU=3Dy CONFIG_PCIEASPM_DEFAULT=3Dy # CONFIG_PCIEASPM_POWERSAVE is not set =20 @@ -119,6 +131,7 @@ CONFIG_HIGHMEM=3Dy CONFIG_HW_PERF_EVENTS=3Dy CONFIG_FLATMEM=3Dy CONFIG_FLAT_NODE_MEM_MAP=3Dy +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ALIGNMENT_TRAP=3Dy =20 # @@ -182,7 +195,12 @@ CONFIG_CMA_AREAS=3D7 # # Bus devices # +CONFIG_MVEBU_MBUS=3Dy CONFIG_ARM_CCI=3Dy + +# +# LPDDR flash memory drivers +# CONFIG_DTC=3Dy CONFIG_OF=3Dy =20 @@ -230,6 +248,7 @@ CONFIG_DM9000=3Dm CONFIG_NET_VENDOR_FARADAY=3Dy # CONFIG_FTMAC100 is not set # CONFIG_FTGMAC100 is not set +CONFIG_MV643XX_ETH=3Dm # CONFIG_MLX4_EN is not set # CONFIG_MLX4_CORE is not set CONFIG_AX88796=3Dm @@ -297,13 +316,20 @@ CONFIG_I2C_RCAR=3Dm # # Pin controllers # +CONFIG_PINMUX=3Dy +CONFIG_PINCONF=3Dy +CONFIG_GENERIC_PINCONF=3Dy +CONFIG_PINCTRL_MVEBU=3Dy CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=3Dy +CONFIG_ARCH_REQUIRE_GPIOLIB=3Dy CONFIG_OF_GPIO=3Dy +CONFIG_GPIO_GENERIC=3Dy =20 # # Memory mapped GPIO drivers: # # CONFIG_GPIO_EM is not set +CONFIG_GPIO_MVEBU=3Dy # CONFIG_GPIO_RCAR is not set # CONFIG_GPIO_GRGPIO is not set =20 @@ -321,7 +347,9 @@ CONFIG_GPIO_BCM_KONA=3Dy # 1-wire Slaves # # CONFIG_APM_POWER is not set +# CONFIG_CHARGER_MANAGER is not set CONFIG_POWER_RESET_GPIO=3Dy +CONFIG_POWER_RESET_QNAP=3Dy CONFIG_POWER_RESET_RESTART=3Dy CONFIG_POWER_RESET_VEXPRESS=3Dy =20 @@ -341,10 +369,23 @@ CONFIG_SENSORS_VEXPRESS=3Dm # # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set + +# +# STMicroelectronics STMPE Interface Drivers +# # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set CONFIG_VEXPRESS_CONFIG=3Dy +CONFIG_REGULATOR=3Dy +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=3Dy +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +CONFIG_REGULATOR_DA9210=3Dm +CONFIG_REGULATOR_LP8755=3Dm +CONFIG_REGULATOR_PFUZE100=3Dm +CONFIG_REGULATOR_VEXPRESS=3Dm =20 # # Media digital TV PCI Adapters @@ -404,6 +445,7 @@ CONFIG_USB_ULPI=3Dy # # MMC/SD/SDIO Host Controller Drivers # +CONFIG_MMC_MVSDIO=3Dm CONFIG_MMC_DW=3Dm # CONFIG_MMC_DW_IDMAC is not set CONFIG_MMC_DW_PLTFM=3Dm @@ -411,6 +453,11 @@ CONFIG_MMC_DW_EXYNOS=3Dm CONFIG_MMC_DW_PCI=3Dm =20 # +# LED drivers +# +CONFIG_LEDS_REGULATOR=3Dm + +# # iptables trigger is under Netfilter config (LED target) # # CONFIG_EDAC is not set @@ -418,15 +465,23 @@ CONFIG_MMC_DW_PCI=3Dm # # on-CPU RTC drivers # +CONFIG_RTC_DRV_MV=3Dm CONFIG_RTC_DRV_SNVS=3Dm =20 # # DMA Devices # +CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=3Dy # CONFIG_DW_DMAC is not set +CONFIG_MV_XOR=3Dy CONFIG_DMA_OF=3Dy =20 # +# Common Clock Framework +# +CONFIG_MVEBU_CLK_COMMON=3Dy + +# # Hardware Spinlock drivers # CONFIG_CLKSRC_OF=3Dy @@ -435,6 +490,11 @@ CONFIG_OF_IOMMU=3Dy # CONFIG_SHMOBILE_IOMMU is not set =20 # +# Rpmsg drivers +# +CONFIG_MVEBU_DEVBUS=3Dy + +# # Analog to digital converters # # CONFIG_EXYNOS_ADC is not set @@ -466,6 +526,7 @@ CONFIG_ARM_UNWIND=3Dy CONFIG_OLD_MCOUNT=3Dy # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_UART_PL01X is not set =20 # # Executable Protections @@ -501,6 +562,7 @@ CONFIG_CRYPTO_AES_ARM=3Dm # # Random Number Generation # +CONFIG_CRYPTO_DEV_MV_CESA=3Dm CONFIG_CRYPTO_DEV_HIFN_795X=3Dm CONFIG_CRYPTO_DEV_HIFN_795X_RNG=3Dy =20 @@ -509,3 +571,4 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=3Dy # CONFIG_ARCH_USE_CMPXCHG_LOCKREF=3Dy CONFIG_AUDIT_GENERIC=3Dy +CONFIG_GENERIC_ATOMIC64=3Dy diff --git a/kernel/config-armv5tel-default b/kernel/config-armv5tel-default new file mode 100644 index 0000000..e14fa04 --- /dev/null +++ b/kernel/config-armv5tel-default @@ -0,0 +1,453 @@ + +# +# General setup +# +CONFIG_BROKEN_ON_SMP=3Dy + +# +# Timers subsystem +# +CONFIG_NO_HZ_IDLE=3Dy + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=3Dy +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set + +# +# RCU Subsystem +# +CONFIG_TINY_RCU=3Dy +# CONFIG_RCU_STALL_COMMON is not set + +# +# System Type +# +# CONFIG_ARCH_MULTIPLATFORM is not set +CONFIG_ARCH_KIRKWOOD=3Dy + +# +# Marvell Kirkwood Implementations +# +CONFIG_KIRKWOOD_LEGACY=3Dy +CONFIG_MACH_D2NET_V2=3Dy +CONFIG_MACH_NET2BIG_V2=3Dy +CONFIG_MACH_NET5BIG_V2=3Dy +CONFIG_MACH_OPENRD=3Dy +CONFIG_MACH_OPENRD_BASE=3Dy +CONFIG_MACH_OPENRD_CLIENT=3Dy +CONFIG_MACH_OPENRD_ULTIMATE=3Dy +CONFIG_MACH_RD88F6192_NAS=3Dy +CONFIG_MACH_RD88F6281=3Dy +CONFIG_MACH_T5325=3Dy +CONFIG_MACH_TS219=3Dy +CONFIG_MACH_TS41X=3Dy + +# +# Device tree entries +# +CONFIG_ARCH_KIRKWOOD_DT=3Dy +CONFIG_MACH_MV88F6281GTW_GE_DT=3Dy +CONFIG_PLAT_ORION_LEGACY=3Dy + +# +# Processor Type +# +CONFIG_CPU_FEROCEON=3Dy +# CONFIG_CPU_FEROCEON_OLD_ID is not set +CONFIG_CPU_32v5=3Dy +CONFIG_CPU_ABRT_EV5T=3Dy +CONFIG_CPU_PABRT_LEGACY=3Dy +CONFIG_CPU_CACHE_VIVT=3Dy +CONFIG_CPU_COPY_FEROCEON=3Dy +CONFIG_CPU_TLB_FEROCEON=3Dy +CONFIG_CPU_USE_DOMAINS=3Dy + +# +# Processor Features +# +CONFIG_NEED_KUSER_HELPERS=3Dy +CONFIG_CACHE_FEROCEON_L2=3Dy +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set +# CONFIG_CACHE_L2X0 is not set +CONFIG_ARM_L1_CACHE_SHIFT=3D5 + +# +# PCI host controller drivers +# +CONFIG_PCCARD=3Dm +# CONFIG_PCMCIA is not set +CONFIG_CARDBUS=3Dy + +# +# PC-card bridges +# +CONFIG_YENTA=3Dm +CONFIG_YENTA_O2=3Dy +CONFIG_YENTA_RICOH=3Dy +CONFIG_YENTA_TI=3Dy +CONFIG_YENTA_ENE_TUNE=3Dy +CONFIG_YENTA_TOSHIBA=3Dy + +# +# Kernel Features +# +CONFIG_ARCH_NR_GPIO=3D0 +CONFIG_SPLIT_PTLOCK_CPUS=3D999999 +CONFIG_DEFAULT_MMAP_MIN_ADDR=3D32768 +CONFIG_NEED_PER_CPU_KM=3Dy +CONFIG_FORCE_MAX_ZONEORDER=3D11 +# CONFIG_UACCESS_WITH_MEMCPY is not set + +# +# Boot options +# +CONFIG_ARM_ATAG_DTB_COMPAT=3Dy +CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=3Dy +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set +CONFIG_CMDLINE=3D"console=3DttyAM0,115200 root=3D/dev/sda1 rootdelay=3D20" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=3Dy +CONFIG_CPU_FREQ_GOV_COMMON=3Dy +CONFIG_CPU_FREQ_STAT=3Dm +CONFIG_CPU_FREQ_STAT_DETAILS=3Dy +# 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=3Dy +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=3Dy +CONFIG_CPU_FREQ_GOV_POWERSAVE=3Dm +CONFIG_CPU_FREQ_GOV_USERSPACE=3Dm +CONFIG_CPU_FREQ_GOV_ONDEMAND=3Dy +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=3Dm + +# +# ARM CPU frequency scaling drivers +# +CONFIG_ARM_KIRKWOOD_CPUFREQ=3Dy + +# +# CPU Idle +# +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set + +# +# Bluetooth device drivers +# +CONFIG_RFKILL_REGULATOR=3Dm + +# +# Generic Driver Options +# +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_REGMAP_I2C=3Dm + +# +# Bus devices +# +# CONFIG_MTD is not set + +# +# Device Tree and Open Firmware support +# +CONFIG_PARPORT=3Dm +CONFIG_PARPORT_PC=3Dm +CONFIG_PARPORT_SERIAL=3Dm +# 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=3Dy +CONFIG_PARPORT_NOT_PC=3Dy +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_RAM_SIZE=3D16384 +# CONFIG_MG_DISK is not set + +# +# Misc devices +# +# CONFIG_SRAM is not set + +# +# SCSI Transports +# +CONFIG_SCSI_PPA=3Dm +CONFIG_SCSI_IMM=3Dm +# 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=3Dm +CONFIG_PCMCIA_XIRCOM=3Dm + +# +# MII PHY device drivers +# +# CONFIG_PLIP is not set + +# +# ISDN feature submodules +# +# CONFIG_ISDN_DRV_LOOP is not set + +# +# Input device support +# +# CONFIG_INPUT_FF_MEMLESS is not set +CONFIG_INPUT_MATRIXKMAP=3Dm + +# +# Input Device Drivers +# +# CONFIG_KEYBOARD_SAMSUNG is not set +# CONFIG_MOUSE_GPIO is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO_PARKBD is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_SCCNXP=3Dm +CONFIG_SERIAL_ARC=3Dm +CONFIG_PRINTER=3Dm +CONFIG_LP_CONSOLE=3Dy +CONFIG_PPDEV=3Dm +CONFIG_I2C=3Dm +CONFIG_I2C_ALGOBIT=3Dm + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_MV64XXX=3Dm + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_PARPORT=3Dm + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_PARPORT is not set + +# +# Pin controllers +# +CONFIG_PINCTRL_SINGLE=3Dm +CONFIG_PINCTRL_KIRKWOOD=3Dy + +# +# Memory mapped GPIO drivers: +# +CONFIG_GPIO_GENERIC_PLATFORM=3Dy + +# +# SPI GPIO expanders: +# +CONFIG_GPIO_MCP23S08=3Dm + +# +# Native drivers +# +CONFIG_CPU_THERMAL=3Dy +CONFIG_KIRKWOOD_THERMAL=3Dm + +# +# Watchdog Device Drivers +# +CONFIG_ORION_WATCHDOG=3Dm + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=3Dm +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_SYSCON is not set +# CONFIG_MFD_TPS65912 is not set +# 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_LP872X=3Dm +# 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 + +# +# Multimedia core support +# +CONFIG_VIDEO_V4L2=3Dm + +# +# Supported MMC/SDIO adapters +# +# CONFIG_MEDIA_PARPORT_SUPPORT is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_VIDEO_IR_I2C=3Dm + +# +# soc_camera sensor drivers +# +CONFIG_MEDIA_TUNER=3Dm +CONFIG_MEDIA_TUNER_SIMPLE=3Dm +CONFIG_MEDIA_TUNER_TDA8290=3Dm +CONFIG_MEDIA_TUNER_TDA827X=3Dm +CONFIG_MEDIA_TUNER_TDA18271=3Dm +CONFIG_MEDIA_TUNER_TDA9887=3Dm +CONFIG_MEDIA_TUNER_MT20XX=3Dm +CONFIG_MEDIA_TUNER_XC2028=3Dm +CONFIG_MEDIA_TUNER_XC5000=3Dm +CONFIG_MEDIA_TUNER_XC4000=3Dm +CONFIG_MEDIA_TUNER_MC44S803=3Dm + +# +# Graphics support +# +CONFIG_DRM=3Dm +CONFIG_DRM_USB=3Dm +CONFIG_DRM_KMS_HELPER=3Dm + +# +# I2C encoder or helper chips +# +CONFIG_DRM_UDL=3Dm +CONFIG_VIDEO_OUTPUT_CONTROL=3Dm +# CONFIG_FB_MODE_HELPERS is not set + +# +# Frame buffer hardware drivers +# +CONFIG_LCD_PLATFORM=3Dm +# CONFIG_BACKLIGHT_PWM is not set + +# +# Console display driver support +# +CONFIG_SND_MTS64=3Dm +CONFIG_SND_PORTMAN2X4=3Dm +CONFIG_SND_LX6464ES=3Dm +CONFIG_SND_KIRKWOOD_SOC=3Dm +CONFIG_SND_KIRKWOOD_SOC_OPENRD=3Dm +CONFIG_SND_KIRKWOOD_SOC_T5325=3Dm +CONFIG_SND_SOC_ALC5623=3Dm +CONFIG_SND_SOC_CS42L51=3Dm + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD_ORION=3Dy + +# +# USB port drivers +# +CONFIG_USB_USS720=3Dm +CONFIG_USB_SERIAL_MOS7715_PARPORT=3Dy + +# +# USB Physical Layer drivers +# +CONFIG_NOP_USB_XCEIV=3Dm +CONFIG_SAMSUNG_USBPHY=3Dm +CONFIG_SAMSUNG_USB2PHY=3Dm +CONFIG_SAMSUNG_USB3PHY=3Dm +CONFIG_MMC=3Dm + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=3Dm + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=3Dm + +# +# LED drivers +# +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_PWM=3Dm +CONFIG_LEDS_NS2=3Dm +CONFIG_LEDS_NETXBIG=3Dm + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_HEARTBEAT=3Dm + +# +# Microsoft Hyper-V guest support +# +# CONFIG_PANEL is not set + +# +# Common Clock Framework +# +CONFIG_KIRKWOOD_CLK=3Dy + +# +# Hardware Spinlock drivers +# +CONFIG_ORION_TIMER=3Dy + +# +# Temperature sensors +# +CONFIG_PWM=3Dy +CONFIG_PWM_SYSFS=3Dy +CONFIG_PWM_PCA9685=3Dm +CONFIG_ORION_IRQCHIP=3Dy + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +# 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 + +# +# Runtime Testing +# +CONFIG_DEBUG_LL_INCLUDE=3D"debug/8250.S" +CONFIG_DEBUG_UART_8250=3Dy +CONFIG_DEBUG_UART_PHYS=3D0xf1012000 +CONFIG_DEBUG_UART_VIRT=3D0xfed12000 +CONFIG_DEBUG_UART_8250_SHIFT=3D2 +# CONFIG_DEBUG_UART_8250_WORD is not set +# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set +CONFIG_UNCOMPRESS_INCLUDE=3D"mach/uncompress.h" + +# +# Library routines +# +CONFIG_HAS_IOPORT=3Dy +# CONFIG_DDR is not set diff --git a/kernel/config-armv5tel-kirkwood b/kernel/config-armv5tel-kirkwood deleted file mode 100644 index b05506f..0000000 --- a/kernel/config-armv5tel-kirkwood +++ /dev/null @@ -1,536 +0,0 @@ -CONFIG_ARCH_HAS_CPUFREQ=3Dy - -# -# General setup -# -CONFIG_BROKEN_ON_SMP=3Dy - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_CHIP=3Dy - -# -# Timers subsystem -# -CONFIG_NO_HZ_IDLE=3Dy - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=3Dy -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set - -# -# RCU Subsystem -# -CONFIG_TINY_RCU=3Dy -# CONFIG_RCU_STALL_COMMON is not set - -# -# System Type -# -# CONFIG_ARCH_MULTIPLATFORM is not set -# CONFIG_ARCH_VERSATILE is not set -CONFIG_ARCH_KIRKWOOD=3Dy - -# -# Marvell Kirkwood Implementations -# -CONFIG_KIRKWOOD_LEGACY=3Dy -CONFIG_MACH_D2NET_V2=3Dy -CONFIG_MACH_NET2BIG_V2=3Dy -CONFIG_MACH_NET5BIG_V2=3Dy -CONFIG_MACH_OPENRD=3Dy -CONFIG_MACH_OPENRD_BASE=3Dy -CONFIG_MACH_OPENRD_CLIENT=3Dy -CONFIG_MACH_OPENRD_ULTIMATE=3Dy -CONFIG_MACH_RD88F6192_NAS=3Dy -CONFIG_MACH_RD88F6281=3Dy -CONFIG_MACH_T5325=3Dy -CONFIG_MACH_TS219=3Dy -CONFIG_MACH_TS41X=3Dy - -# -# Device tree entries -# -CONFIG_ARCH_KIRKWOOD_DT=3Dy -CONFIG_MACH_MV88F6281GTW_GE_DT=3Dy -CONFIG_PLAT_ORION=3Dy -CONFIG_PLAT_ORION_LEGACY=3Dy - -# -# Processor Type -# -CONFIG_CPU_FEROCEON=3Dy -# CONFIG_CPU_FEROCEON_OLD_ID is not set -CONFIG_CPU_32v5=3Dy -CONFIG_CPU_ABRT_EV5T=3Dy -CONFIG_CPU_PABRT_LEGACY=3Dy -CONFIG_CPU_CACHE_VIVT=3Dy -CONFIG_CPU_COPY_FEROCEON=3Dy -CONFIG_CPU_TLB_FEROCEON=3Dy -CONFIG_CPU_USE_DOMAINS=3Dy - -# -# Processor Features -# -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_NEED_KUSER_HELPERS=3Dy -CONFIG_KUSER_HELPERS=3Dy -CONFIG_OUTER_CACHE=3Dy -CONFIG_CACHE_FEROCEON_L2=3Dy -# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -# CONFIG_CACHE_L2X0 is not set -CONFIG_ARM_L1_CACHE_SHIFT=3D5 - -# -# PCI host controller drivers -# -CONFIG_PCI_MVEBU=3Dy -CONFIG_PCCARD=3Dm -# CONFIG_PCMCIA is not set -CONFIG_CARDBUS=3Dy - -# -# PC-card bridges -# -CONFIG_YENTA=3Dm -CONFIG_YENTA_O2=3Dy -CONFIG_YENTA_RICOH=3Dy -CONFIG_YENTA_TI=3Dy -CONFIG_YENTA_ENE_TUNE=3Dy -CONFIG_YENTA_TOSHIBA=3Dy - -# -# Kernel Features -# -CONFIG_ARCH_NR_GPIO=3D0 -CONFIG_SPLIT_PTLOCK_CPUS=3D999999 -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=3D0 -CONFIG_DEFAULT_MMAP_MIN_ADDR=3D32768 -CONFIG_NEED_PER_CPU_KM=3Dy -CONFIG_FORCE_MAX_ZONEORDER=3D11 -# CONFIG_UACCESS_WITH_MEMCPY is not set - -# -# Boot options -# -CONFIG_ARM_ATAG_DTB_COMPAT=3Dy -CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=3Dy -# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set -CONFIG_CMDLINE=3D"console=3DttyAM0,115200 root=3D/dev/sda1 rootdelay=3D20" -# CONFIG_XIP_KERNEL is not set - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=3Dy -CONFIG_CPU_FREQ_GOV_COMMON=3Dy -CONFIG_CPU_FREQ_STAT=3Dm -CONFIG_CPU_FREQ_STAT_DETAILS=3Dy -# 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=3Dy -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=3Dy -CONFIG_CPU_FREQ_GOV_POWERSAVE=3Dm -CONFIG_CPU_FREQ_GOV_USERSPACE=3Dm -CONFIG_CPU_FREQ_GOV_ONDEMAND=3Dy -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=3Dm - -# -# ARM CPU frequency scaling drivers -# -CONFIG_ARM_KIRKWOOD_CPUFREQ=3Dy - -# -# CPU Idle -# -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set - -# -# Bluetooth device drivers -# -CONFIG_RFKILL_REGULATOR=3Dm - -# -# Generic Driver Options -# -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_REGMAP_I2C=3Dm - -# -# Bus devices -# -CONFIG_MVEBU_MBUS=3Dy -# CONFIG_MTD is not set - -# -# Device Tree and Open Firmware support -# -CONFIG_PARPORT=3Dm -CONFIG_PARPORT_PC=3Dm -CONFIG_PARPORT_SERIAL=3Dm -# 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=3Dy -CONFIG_PARPORT_NOT_PC=3Dy -# CONFIG_PARIDE is not set -CONFIG_BLK_DEV_RAM_SIZE=3D16384 -# CONFIG_MG_DISK is not set - -# -# Misc devices -# -# CONFIG_SRAM is not set - -# -# SCSI Transports -# -CONFIG_SCSI_PPA=3Dm -CONFIG_SCSI_IMM=3Dm -# 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=3Dm -CONFIG_PCMCIA_XIRCOM=3Dm -CONFIG_MV643XX_ETH=3Dm - -# -# MII PHY device drivers -# -# CONFIG_PLIP is not set - -# -# ISDN feature submodules -# -# CONFIG_ISDN_DRV_LOOP is not set - -# -# Input device support -# -# CONFIG_INPUT_FF_MEMLESS is not set -CONFIG_INPUT_MATRIXKMAP=3Dm - -# -# Input Device Drivers -# -# CONFIG_KEYBOARD_SAMSUNG is not set -# CONFIG_MOUSE_GPIO is not set - -# -# Hardware I/O ports -# -# CONFIG_SERIO_PARKBD is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_SCCNXP=3Dm -CONFIG_SERIAL_ARC=3Dm -CONFIG_PRINTER=3Dm -CONFIG_LP_CONSOLE=3Dy -CONFIG_PPDEV=3Dm -CONFIG_I2C=3Dm -CONFIG_I2C_ALGOBIT=3Dm - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_MV64XXX=3Dm - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_PARPORT=3Dm - -# -# PPS clients support -# -# CONFIG_PPS_CLIENT_PARPORT is not set - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PINCTRL=3Dy - -# -# Pin controllers -# -CONFIG_PINMUX=3Dy -CONFIG_PINCONF=3Dy -CONFIG_GENERIC_PINCONF=3Dy -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_SINGLE=3Dm -CONFIG_PINCTRL_MVEBU=3Dy -CONFIG_PINCTRL_KIRKWOOD=3Dy -CONFIG_ARCH_REQUIRE_GPIOLIB=3Dy -CONFIG_GPIO_GENERIC=3Dy - -# -# Memory mapped GPIO drivers: -# -CONFIG_GPIO_GENERIC_PLATFORM=3Dy -CONFIG_GPIO_MVEBU=3Dy - -# -# SPI GPIO expanders: -# -CONFIG_GPIO_MCP23S08=3Dm - -# -# 1-wire Slaves -# -# CONFIG_CHARGER_MANAGER is not set -CONFIG_POWER_RESET_QNAP=3Dy - -# -# Native drivers -# -CONFIG_CPU_THERMAL=3Dy -CONFIG_KIRKWOOD_THERMAL=3Dm - -# -# Watchdog Device Drivers -# -CONFIG_ORION_WATCHDOG=3Dm - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=3Dm -# CONFIG_ABX500_CORE is not set -# CONFIG_MFD_SYSCON is not set -# CONFIG_MFD_TPS65912 is not set -CONFIG_REGULATOR=3Dy -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=3Dy -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_AD5398 is not set -CONFIG_REGULATOR_DA9210=3Dm -# 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_LP872X=3Dm -CONFIG_REGULATOR_LP8755=3Dm -# 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_PFUZE100=3Dm -# 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_VEXPRESS=3Dm - -# -# Multimedia core support -# -CONFIG_VIDEO_V4L2=3Dm - -# -# Supported MMC/SDIO adapters -# -# CONFIG_MEDIA_PARPORT_SUPPORT is not set - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_VIDEO_IR_I2C=3Dm - -# -# soc_camera sensor drivers -# -CONFIG_MEDIA_TUNER=3Dm -CONFIG_MEDIA_TUNER_SIMPLE=3Dm -CONFIG_MEDIA_TUNER_TDA8290=3Dm -CONFIG_MEDIA_TUNER_TDA827X=3Dm -CONFIG_MEDIA_TUNER_TDA18271=3Dm -CONFIG_MEDIA_TUNER_TDA9887=3Dm -CONFIG_MEDIA_TUNER_MT20XX=3Dm -CONFIG_MEDIA_TUNER_XC2028=3Dm -CONFIG_MEDIA_TUNER_XC5000=3Dm -CONFIG_MEDIA_TUNER_XC4000=3Dm -CONFIG_MEDIA_TUNER_MC44S803=3Dm - -# -# Graphics support -# -CONFIG_DRM=3Dm -CONFIG_DRM_USB=3Dm -CONFIG_DRM_KMS_HELPER=3Dm - -# -# I2C encoder or helper chips -# -CONFIG_DRM_UDL=3Dm -CONFIG_VIDEO_OUTPUT_CONTROL=3Dm -# CONFIG_FB_MODE_HELPERS is not set - -# -# Frame buffer hardware drivers -# -CONFIG_LCD_PLATFORM=3Dm -# CONFIG_BACKLIGHT_PWM is not set - -# -# Console display driver support -# -CONFIG_SND_MTS64=3Dm -CONFIG_SND_PORTMAN2X4=3Dm -CONFIG_SND_LX6464ES=3Dm -CONFIG_SND_KIRKWOOD_SOC=3Dm -CONFIG_SND_KIRKWOOD_SOC_OPENRD=3Dm -CONFIG_SND_KIRKWOOD_SOC_T5325=3Dm -CONFIG_SND_SOC_ALC5623=3Dm -CONFIG_SND_SOC_CS42L51=3Dm - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD_ORION=3Dy - -# -# USB port drivers -# -CONFIG_USB_USS720=3Dm -CONFIG_USB_SERIAL_MOS7715_PARPORT=3Dy - -# -# USB Physical Layer drivers -# -CONFIG_NOP_USB_XCEIV=3Dm -CONFIG_SAMSUNG_USBPHY=3Dm -CONFIG_SAMSUNG_USB2PHY=3Dm -CONFIG_SAMSUNG_USB3PHY=3Dm -CONFIG_MMC=3Dm - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=3Dm - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=3Dm -CONFIG_MMC_MVSDIO=3Dm - -# -# LED drivers -# -# CONFIG_LEDS_GPIO is not set -CONFIG_LEDS_PWM=3Dm -CONFIG_LEDS_REGULATOR=3Dm -CONFIG_LEDS_NS2=3Dm -CONFIG_LEDS_NETXBIG=3Dm - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGER_HEARTBEAT=3Dm - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_MV=3Dm - -# -# DMA Devices -# -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=3Dy -CONFIG_MV_XOR=3Dy - -# -# DMA Clients -# -CONFIG_DMA_ENGINE_RAID=3Dy - -# -# Microsoft Hyper-V guest support -# -# CONFIG_PANEL is not set - -# -# Android -# -CONFIG_COMMON_CLK=3Dy - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_DEBUG is not set -CONFIG_COMMON_CLK_SI5351=3Dm -CONFIG_MVEBU_CLK_COMMON=3Dy -CONFIG_KIRKWOOD_CLK=3Dy - -# -# Hardware Spinlock drivers -# -CONFIG_ORION_TIMER=3Dy - -# -# Rpmsg drivers -# -CONFIG_MVEBU_DEVBUS=3Dy - -# -# Temperature sensors -# -CONFIG_PWM=3Dy -CONFIG_PWM_SYSFS=3Dy -CONFIG_PWM_PCA9685=3Dm -CONFIG_ORION_IRQCHIP=3Dy - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -# 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 - -# -# Runtime Testing -# -CONFIG_DEBUG_LL_INCLUDE=3D"debug/8250.S" -# CONFIG_DEBUG_UART_PL01X is not set -CONFIG_DEBUG_UART_8250=3Dy -CONFIG_DEBUG_UART_PHYS=3D0xf1012000 -CONFIG_DEBUG_UART_VIRT=3D0xfed12000 -CONFIG_DEBUG_UART_8250_SHIFT=3D2 -# CONFIG_DEBUG_UART_8250_WORD is not set -# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set -CONFIG_UNCOMPRESS_INCLUDE=3D"mach/uncompress.h" - -# -# Random Number Generation -# -CONFIG_CRYPTO_DEV_MV_CESA=3Dm - -# -# Library routines -# -CONFIG_RATIONAL=3Dy -CONFIG_HAS_IOPORT=3Dy -CONFIG_GENERIC_ATOMIC64=3Dy -# CONFIG_DDR is not set diff --git a/kernel/config-armv7hl-default b/kernel/config-armv7hl-default index 1ab7492..73dd9ec 100644 --- a/kernel/config-armv7hl-default +++ b/kernel/config-armv7hl-default @@ -1,8 +1,16 @@ +CONFIG_MIGHT_HAVE_PCI=3Dy CONFIG_NO_IOPORT=3Dy -CONFIG_ZONE_DMA=3Dy +CONFIG_ARCH_HAS_BANDGAP=3Dy CONFIG_FIQ=3Dy =20 # +# IRQ subsystem +# +CONFIG_SPARSE_IRQ=3Dy +CONFIG_ARCH_HAS_TICK_BROADCAST=3Dy +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=3Dy + +# # Timers subsystem # # CONFIG_NO_HZ_IDLE is not set @@ -19,22 +27,42 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=3Dy # # RCU Subsystem # +CONFIG_TREE_RCU=3Dy +CONFIG_RCU_STALL_COMMON=3Dy CONFIG_CONTEXT_TRACKING=3Dy CONFIG_RCU_USER_QS=3Dy CONFIG_CONTEXT_TRACKING_FORCE=3Dy +CONFIG_RCU_FANOUT=3D32 +CONFIG_RCU_FANOUT_LEAF=3D16 +# CONFIG_RCU_FANOUT_EXACT is not set CONFIG_RCU_FAST_NO_HZ=3Dy CONFIG_RCU_NOCB_CPU=3Dy CONFIG_RCU_NOCB_CPU_ALL=3Dy =20 # +# Kernel Performance Events And Counters +# +CONFIG_SLUB_CPU_PARTIAL=3Dy + +# # IO Schedulers # CONFIG_PADATA=3Dy +CONFIG_MUTEX_SPIN_ON_OWNER=3Dy + +# +# System Type +# +CONFIG_ARCH_MULTIPLATFORM=3Dy +# CONFIG_ARCH_KIRKWOOD is not set =20 # # CPU Core family selection # CONFIG_ARCH_MULTI_V6=3Dy +CONFIG_ARCH_MULTI_V7=3Dy +CONFIG_ARCH_MULTI_V6_V7=3Dy +# CONFIG_ARCH_MULTI_CPU_AUTO is not set CONFIG_ARCH_MVEBU=3Dy =20 # @@ -50,12 +78,7 @@ CONFIG_ARCH_BCM=3Dy # # CONFIG_ARCH_BCM_MOBILE is not set CONFIG_ARCH_BCM2835=3Dy -CONFIG_ARCH_CNS3XXX=3Dy - -# -# CNS3XXX platform type -# -CONFIG_MACH_CNS3420VB=3Dy +# CONFIG_ARCH_CNS3XXX is not set CONFIG_ARCH_HIGHBANK=3Dy CONFIG_ARCH_KEYSTONE=3Dy CONFIG_ARCH_MXC=3Dy @@ -142,17 +165,29 @@ CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=3Dy CONFIG_POWER_AVS_OMAP=3Dy CONFIG_POWER_AVS_OMAP_CLASS3=3Dy CONFIG_OMAP_RESET_CLOCKS=3Dy +CONFIG_OMAP_MUX=3Dy +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=3Dy +CONFIG_OMAP_32K_TIMER=3Dy # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +CONFIG_OMAP_DM_TIMER=3Dy +CONFIG_OMAP_PM_NOOP=3Dy +CONFIG_MACH_OMAP_GENERIC=3Dy +CONFIG_ARCH_OMAP=3Dy # CONFIG_ARCH_OMAP2 is not set CONFIG_ARCH_OMAP3=3Dy CONFIG_ARCH_OMAP4=3Dy +CONFIG_SOC_OMAP5=3Dy CONFIG_SOC_AM33XX=3Dy CONFIG_SOC_AM43XX=3Dy +CONFIG_ARCH_OMAP2PLUS=3Dy =20 # # TI OMAP2/3/4 Specific Features # +CONFIG_ARCH_OMAP2PLUS_TYPICAL=3Dy CONFIG_SOC_HAS_OMAP2_SDRC=3Dy +CONFIG_SOC_HAS_REALTIME_COUNTER=3Dy CONFIG_SOC_DRA7XX=3Dy CONFIG_SOC_OMAP3430=3Dy CONFIG_SOC_TI81XX=3Dy @@ -217,6 +252,7 @@ CONFIG_ARCH_ATLAS6=3Dy CONFIG_ARCH_PRIMA2=3Dy CONFIG_ARCH_MARCO=3Dy CONFIG_SIRF_IRQ=3Dy +CONFIG_ARCH_TEGRA=3Dy =20 # # NVIDIA Tegra options @@ -225,6 +261,8 @@ CONFIG_ARCH_TEGRA_2x_SOC=3Dy CONFIG_ARCH_TEGRA_3x_SOC=3Dy CONFIG_ARCH_TEGRA_114_SOC=3Dy CONFIG_ARCH_TEGRA_124_SOC=3Dy +CONFIG_TEGRA_AHB=3Dy +# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set CONFIG_ARCH_U8500=3Dy CONFIG_UX500_SOC_DB8500=3Dy =20 @@ -252,7 +290,6 @@ CONFIG_ARCH_VT8500=3Dy CONFIG_ARCH_WM8750=3Dy CONFIG_ARCH_WM8850=3Dy CONFIG_ARCH_ZYNQ=3Dy -CONFIG_PLAT_ORION=3Dy CONFIG_PLAT_VERSATILE=3Dy CONFIG_ARM_TIMER_SP804=3Dy =20 @@ -262,22 +299,37 @@ CONFIG_ARM_TIMER_SP804=3Dy CONFIG_CPU_PJ4B=3Dy CONFIG_CPU_V6=3Dy CONFIG_CPU_V6K=3Dy +CONFIG_CPU_V7=3Dy CONFIG_CPU_32v6=3Dy +CONFIG_CPU_32v6K=3Dy +CONFIG_CPU_32v7=3Dy CONFIG_CPU_ABRT_EV6=3Dy +CONFIG_CPU_ABRT_EV7=3Dy CONFIG_CPU_PABRT_V6=3Dy +CONFIG_CPU_PABRT_V7=3Dy CONFIG_CPU_CACHE_V6=3Dy +CONFIG_CPU_CACHE_V7=3Dy +CONFIG_CPU_CACHE_VIPT=3Dy +CONFIG_CPU_COPY_V6=3Dy CONFIG_CPU_TLB_V6=3Dy +CONFIG_CPU_TLB_V7=3Dy +CONFIG_CPU_HAS_ASID=3Dy =20 # # Processor Features # -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_VIRT_EXT=3Dy +CONFIG_SWP_EMULATE=3Dy # CONFIG_CPU_BIG_ENDIAN is not set -CONFIG_KUSER_HELPERS=3Dy +# CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_DMA_CACHE_RWFO=3Dy -CONFIG_OUTER_CACHE=3Dy CONFIG_OUTER_CACHE_SYNC=3Dy +CONFIG_MIGHT_HAVE_CACHE_L2X0=3Dy CONFIG_CACHE_L2X0=3Dy +CONFIG_ARM_L1_CACHE_SHIFT_6=3Dy +CONFIG_ARM_L1_CACHE_SHIFT=3D6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=3Dy CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=3Dy CONFIG_PJ4B_ERRATA_4742=3Dy # CONFIG_ARM_ERRATA_326103 is not set @@ -293,7 +345,10 @@ CONFIG_ARM_ERRATA_364296=3Dy CONFIG_ARM_ERRATA_764369=3Dy CONFIG_PL310_ERRATA_769419=3Dy CONFIG_ARM_ERRATA_775420=3Dy +CONFIG_ARM_ERRATA_798181=3Dy +# CONFIG_ARM_ERRATA_773022 is not set CONFIG_ICST=3Dy +CONFIG_TI_PRIV_EDMA=3Dy =20 # # Bus support @@ -304,7 +359,6 @@ CONFIG_PCI_DOMAINS=3Dy # # PCI host controller drivers # -CONFIG_PCI_MVEBU=3Dy CONFIG_PCIE_DW=3Dy CONFIG_PCI_IMX6=3Dy CONFIG_PCI_TEGRA=3Dy @@ -313,21 +367,34 @@ CONFIG_PCI_TEGRA=3Dy # # Kernel Features # +CONFIG_SMP=3Dy +CONFIG_SMP_ON_UP=3Dy +CONFIG_ARM_CPU_TOPOLOGY=3Dy CONFIG_SCHED_MC=3Dy CONFIG_SCHED_SMT=3Dy +# CONFIG_MCPM is not set +# CONFIG_BIG_LITTLE is not set CONFIG_NR_CPUS=3D8 +CONFIG_HOTPLUG_CPU=3Dy CONFIG_ARM_PSCI=3Dy -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=3D1 +CONFIG_ARCH_NR_GPIO=3D1024 +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=3Dy +CONFIG_SPLIT_PTLOCK_CPUS=3D4 CONFIG_DEFAULT_MMAP_MIN_ADDR=3D4096 CONFIG_FORCE_MAX_ZONEORDER=3D12 =20 # # Boot options # +# CONFIG_ARM_ATAG_DTB_COMPAT is not set CONFIG_CMDLINE=3D"root=3D/dev/ram0 rw ramdisk=3D8192 initrd=3D0x41000000,8M = console=3DttySAC1,115200 init=3D/linuxrc mem=3D256M" =20 # +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# # CPU Idle # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=3Dy @@ -335,18 +402,35 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=3Dy # # At least one emulation must be selected # +CONFIG_VFPv3=3Dy +CONFIG_NEON=3Dy CONFIG_KERNEL_MODE_NEON=3Dy =20 # # Power management options # +CONFIG_PM_SLEEP_SMP=3Dy CONFIG_ARCH_HAS_OPP=3Dy CONFIG_PM_OPP=3Dy =20 # +# Classification +# +CONFIG_RPS=3Dy +CONFIG_RFS_ACCEL=3Dy +CONFIG_XPS=3Dy +CONFIG_NET_FLOW_LIMIT=3Dy + +# +# Bluetooth device drivers +# +# CONFIG_RFKILL_REGULATOR is not set + +# # Generic Driver Options # CONFIG_FIRMWARE_IN_KERNEL=3Dy +CONFIG_SOC_BUS=3Dy CONFIG_REGMAP_I2C=3Dy CONFIG_REGMAP_MMIO=3Dy =20 @@ -354,7 +438,6 @@ CONFIG_REGMAP_MMIO=3Dy # Bus devices # CONFIG_IMX_WEIM=3Dy -CONFIG_MVEBU_MBUS=3Dy CONFIG_OMAP_OCP2SCP=3Dm CONFIG_OMAP_INTERCONNECT=3Dy CONFIG_MTD=3Dy @@ -494,7 +577,6 @@ CONFIG_NET_VENDOR_ALLWINNER=3Dy CONFIG_SUN4I_EMAC=3Dm CONFIG_NET_VENDOR_FREESCALE=3Dy CONFIG_FEC=3Dm -CONFIG_MV643XX_ETH=3Dm CONFIG_MVNETA=3Dm CONFIG_SFC_MTD=3Dy # CONFIG_TI_DAVINCI_EMAC is not set @@ -571,6 +653,7 @@ CONFIG_HW_RANDOM_BCM2835=3Dy CONFIG_HW_RANDOM_OMAP=3Dm CONFIG_HW_RANDOM_OMAP3_ROM=3Dm CONFIG_HW_RANDOM_MXC_RNGA=3Dm +CONFIG_I2C=3Dy CONFIG_I2C_ALGOBIT=3Dy =20 # @@ -581,6 +664,7 @@ CONFIG_I2C_DAVINCI=3Dm CONFIG_I2C_IMX=3Dy CONFIG_I2C_MV64XXX=3Dy CONFIG_I2C_NOMADIK=3Dy +CONFIG_I2C_OMAP=3Dy CONFIG_I2C_SIRF=3Dy CONFIG_I2C_ST=3Dm CONFIG_I2C_TEGRA=3Dy @@ -590,9 +674,6 @@ CONFIG_I2C_WMT=3Dy # # Pin controllers # -CONFIG_PINMUX=3Dy -CONFIG_PINCONF=3Dy -CONFIG_GENERIC_PINCONF=3Dy CONFIG_PINCTRL_ABX500=3Dy CONFIG_PINCTRL_AB8500=3Dy CONFIG_PINCTRL_AB8540=3Dy @@ -611,6 +692,7 @@ CONFIG_PINCTRL_NOMADIK=3Dy CONFIG_PINCTRL_DB8500=3Dy CONFIG_PINCTRL_DB8540=3Dy CONFIG_PINCTRL_ROCKCHIP=3Dy +# CONFIG_PINCTRL_SINGLE is not set CONFIG_PINCTRL_SIRF=3Dy CONFIG_PINCTRL_SUNXI=3Dy CONFIG_PINCTRL_ST=3Dy @@ -619,21 +701,19 @@ CONFIG_PINCTRL_TEGRA20=3Dy CONFIG_PINCTRL_TEGRA30=3Dy CONFIG_PINCTRL_TEGRA114=3Dy # CONFIG_PINCTRL_PALMAS is not set -CONFIG_PINCTRL_MVEBU=3Dy CONFIG_PINCTRL_ARMADA_370=3Dy CONFIG_PINCTRL_ARMADA_XP=3Dy CONFIG_PINCTRL_WMT=3Dy CONFIG_PINCTRL_WM8750=3Dy CONFIG_PINCTRL_WM8850=3Dy CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=3Dy -CONFIG_GPIO_GENERIC=3Dy # CONFIG_GPIO_DA9052 is not set # CONFIG_GPIO_DA9055 is not set =20 # # Memory mapped GPIO drivers: # -CONFIG_GPIO_MVEBU=3Dy +# CONFIG_GPIO_GENERIC_PLATFORM is not set CONFIG_GPIO_MXC=3Dy CONFIG_GPIO_PL061=3Dy # CONFIG_GPIO_XILINX is not set @@ -643,6 +723,7 @@ CONFIG_GPIO_PL061=3Dy # CONFIG_GPIO_MC9S08DZ60=3Dy # CONFIG_GPIO_RC5T583 is not set +# CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_STMPE is not set # CONFIG_GPIO_TC3589X is not set # CONFIG_GPIO_TPS65912 is not set @@ -654,6 +735,11 @@ CONFIG_GPIO_TWL6040=3Dm # CONFIG_GPIO_ADP5520 is not set =20 # +# SPI GPIO expanders: +# +# CONFIG_GPIO_MCP23S08 is not set + +# # MODULbus GPIO expanders: # # CONFIG_GPIO_PALMAS is not set @@ -664,6 +750,7 @@ CONFIG_GPIO_TWL6040=3Dm # 1-wire Bus Masters # CONFIG_W1_MASTER_MXC=3Dm +# CONFIG_HDQ_MASTER_OMAP is not set =20 # # 1-wire Slaves @@ -682,7 +769,6 @@ CONFIG_W1_MASTER_MXC=3Dm # CONFIG_CHARGER_MAX8998 is not set # CONFIG_CHARGER_TPS65090 is not set # CONFIG_AB8500_BM is not set -CONFIG_POWER_RESET_QNAP=3Dy =20 # # Native drivers @@ -760,6 +846,7 @@ CONFIG_MFD_STMPE=3Dy CONFIG_STMPE_I2C=3Dy CONFIG_MFD_SYSCON=3Dy CONFIG_MFD_LP8788=3Dy +CONFIG_MFD_OMAP_USB_HOST=3Dy CONFIG_MFD_PALMAS=3Dy CONFIG_MFD_TPS65090=3Dy CONFIG_MFD_TPS6586X=3Dy @@ -779,7 +866,6 @@ CONFIG_MFD_WM831X_I2C=3Dy CONFIG_MFD_WM8350=3Dy CONFIG_MFD_WM8350_I2C=3Dy CONFIG_MFD_WM8994=3Dy -CONFIG_REGULATOR_FIXED_VOLTAGE=3Dy CONFIG_REGULATOR_88PM800=3Dm CONFIG_REGULATOR_88PM8607=3Dy CONFIG_REGULATOR_AD5398=3Dm @@ -793,7 +879,6 @@ CONFIG_REGULATOR_DA903X=3Dm CONFIG_REGULATOR_DA9052=3Dm CONFIG_REGULATOR_DA9055=3Dm CONFIG_REGULATOR_DA9063=3Dm -CONFIG_REGULATOR_DA9210=3Dm CONFIG_REGULATOR_DBX500_PRCMU=3Dy CONFIG_REGULATOR_DB8500_PRCMU=3Dy CONFIG_REGULATOR_FAN53555=3Dm @@ -802,7 +887,6 @@ CONFIG_REGULATOR_ISL6271A=3Dm CONFIG_REGULATOR_LP3971=3Dm CONFIG_REGULATOR_LP3972=3Dm CONFIG_REGULATOR_LP872X=3Dy -CONFIG_REGULATOR_LP8755=3Dm CONFIG_REGULATOR_LP8788=3Dy CONFIG_REGULATOR_MAX1586=3Dm CONFIG_REGULATOR_MAX8649=3Dm @@ -816,7 +900,6 @@ CONFIG_REGULATOR_MAX8998=3Dm CONFIG_REGULATOR_MAX77686=3Dm CONFIG_REGULATOR_MAX77693=3Dm CONFIG_REGULATOR_PALMAS=3Dm -CONFIG_REGULATOR_PFUZE100=3Dm CONFIG_REGULATOR_RC5T583=3Dm CONFIG_REGULATOR_S2MPS11=3Dm CONFIG_REGULATOR_S5M8767=3Dm @@ -831,13 +914,17 @@ CONFIG_REGULATOR_TPS65910=3Dm CONFIG_REGULATOR_TPS65912=3Dm CONFIG_REGULATOR_TPS80031=3Dm CONFIG_REGULATOR_TWL4030=3Dy -CONFIG_REGULATOR_VEXPRESS=3Dm CONFIG_REGULATOR_WM831X=3Dm CONFIG_REGULATOR_WM8350=3Dm CONFIG_REGULATOR_WM8400=3Dm CONFIG_REGULATOR_WM8994=3Dm =20 # +# Multimedia core support +# +CONFIG_VIDEO_V4L2=3Dy + +# # Media drivers # # CONFIG_RC_ST is not set @@ -854,6 +941,26 @@ CONFIG_VIDEO_TI_VPE=3Dm # CONFIG_VIDEO_TI_VPE_DEBUG is not set =20 # +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_VIDEO_IR_I2C=3Dy + +# +# soc_camera sensor drivers +# +CONFIG_MEDIA_TUNER=3Dy +CONFIG_MEDIA_TUNER_SIMPLE=3Dy +CONFIG_MEDIA_TUNER_TDA8290=3Dy +CONFIG_MEDIA_TUNER_TDA827X=3Dy +CONFIG_MEDIA_TUNER_TDA18271=3Dy +CONFIG_MEDIA_TUNER_TDA9887=3Dy +CONFIG_MEDIA_TUNER_MT20XX=3Dy +CONFIG_MEDIA_TUNER_XC2028=3Dy +CONFIG_MEDIA_TUNER_XC5000=3Dy +CONFIG_MEDIA_TUNER_XC4000=3Dy +CONFIG_MEDIA_TUNER_MC44S803=3Dy + +# # Graphics support # CONFIG_TEGRA_HOST1X=3Dy @@ -992,9 +1099,15 @@ CONFIG_SND_SOC_WM9712=3Dm CONFIG_SND_SOC_TPA6130A2=3Dm =20 # +# I2C HID support +# +CONFIG_USB_ARCH_HAS_EHCI=3Dy + +# # USB Host Controller Drivers # CONFIG_USB_EHCI_MXC=3Dm +CONFIG_USB_EHCI_HCD_OMAP=3Dy CONFIG_USB_EHCI_HCD_ORION=3Dm CONFIG_USB_EHCI_TEGRA=3Dy # CONFIG_USB_CNS3XXX_EHCI is not set @@ -1008,12 +1121,14 @@ CONFIG_USB_IMX21_HCD=3Dm # USB Physical Layer drivers # CONFIG_AB8500_USB=3Dm +CONFIG_NOP_USB_XCEIV=3Dy CONFIG_OMAP_CONTROL_USB=3Dm CONFIG_OMAP_USB3=3Dm CONFIG_SAMSUNG_USBPHY=3Dy CONFIG_SAMSUNG_USB2PHY=3Dy CONFIG_SAMSUNG_USB3PHY=3Dy CONFIG_USB_MXS_PHY=3Dm +CONFIG_USB_ULPI_VIEWPORT=3Dy CONFIG_MMC=3Dy =20 # @@ -1036,7 +1151,6 @@ CONFIG_MMC_SDHCI_BCM2835=3Dm CONFIG_MMC_OMAP=3Dy CONFIG_MMC_OMAP_HS=3Dy CONFIG_MMC_MXC=3Dm -CONFIG_MMC_MVSDIO=3Dm # CONFIG_MMC_DW_SOCFPGA is not set CONFIG_MMC_WMT=3Dm =20 @@ -1055,7 +1169,6 @@ CONFIG_LEDS_GPIO=3Dy # CONFIG_LEDS_WM8350 is not set # CONFIG_LEDS_DA903X is not set # CONFIG_LEDS_DA9052 is not set -CONFIG_LEDS_REGULATOR=3Dm # CONFIG_LEDS_ADP5520 is not set # CONFIG_LEDS_MAX8997 is not set =20 @@ -1102,7 +1215,6 @@ CONFIG_RTC_DRV_OMAP=3Dm CONFIG_RTC_DRV_PL030=3Dm CONFIG_RTC_DRV_PL031=3Dm CONFIG_RTC_DRV_VT8500=3Dm -CONFIG_RTC_DRV_MV=3Dm CONFIG_RTC_DRV_TEGRA=3Dm CONFIG_RTC_DRV_MXC=3Dm CONFIG_RTC_DRV_SIRFSOC=3Dm @@ -1110,9 +1222,7 @@ CONFIG_RTC_DRV_SIRFSOC=3Dm # # DMA Devices # -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=3Dy # CONFIG_AMBA_PL08X is not set -CONFIG_MV_XOR=3Dy CONFIG_MX3_IPU=3Dy CONFIG_MX3_IPU_IRQS=3D4 CONFIG_TEGRA20_APB_DMA=3Dy @@ -1128,9 +1238,14 @@ CONFIG_TI_CPPI41=3Dm CONFIG_DMA_VIRTUAL_CHANNELS=3Dy =20 # -# DMA Clients +# Speakup console speech +# +# CONFIG_MFD_NVEC is not set + +# +# Android # -CONFIG_DMA_ENGINE_RAID=3Dy +# CONFIG_DRM_IMX is not set =20 # # Common Clock Framework @@ -1138,12 +1253,10 @@ CONFIG_DMA_ENGINE_RAID=3Dy # CONFIG_COMMON_CLK_WM831X is not set CONFIG_COMMON_CLK_VERSATILE=3Dy # CONFIG_COMMON_CLK_MAX77686 is not set -CONFIG_COMMON_CLK_SI5351=3Dm CONFIG_COMMON_CLK_S2MPS11=3Dm CONFIG_CLK_TWL6040=3Dm CONFIG_COMMON_CLK_AXI_CLKGEN=3Dm CONFIG_COMMON_CLK_KEYSTONE=3Dy -CONFIG_MVEBU_CLK_COMMON=3Dy CONFIG_MVEBU_CLK_CPU=3Dy CONFIG_ARMADA_370_CLK=3Dy CONFIG_ARMADA_XP_CLK=3Dy @@ -1163,6 +1276,8 @@ CONFIG_CADENCE_TTC_TIMER=3Dy CONFIG_CLKSRC_NOMADIK_MTU=3Dy CONFIG_CLKSRC_DBX500_PRCMU=3Dy CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=3Dy +CONFIG_ARM_ARCH_TIMER=3Dy +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=3Dy CONFIG_ARM_GLOBAL_TIMER=3Dy CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=3Dy CONFIG_VF_PIT_TIMER=3Dy @@ -1170,13 +1285,14 @@ CONFIG_PL320_MBOX=3Dy CONFIG_OMAP_MBOX=3Dm CONFIG_OMAP2PLUS_MBOX=3Dm CONFIG_OMAP_MBOX_KFIFO_SIZE=3D256 +# CONFIG_OMAP_IOMMU is not set # CONFIG_TEGRA_IOMMU_GART is not set +# CONFIG_TEGRA_IOMMU_SMMU is not set =20 # # Rpmsg drivers # CONFIG_TI_EMIF=3Dm -CONFIG_MVEBU_DEVBUS=3Dy CONFIG_TEGRA20_MC=3Dy CONFIG_TEGRA30_MC=3Dy =20 @@ -1190,6 +1306,7 @@ CONFIG_TEGRA30_MC=3Dy # Temperature sensors # # CONFIG_PWM is not set +CONFIG_ARM_GIC=3Dy CONFIG_ARM_VIC=3Dy CONFIG_ARM_VIC_NR=3D2 CONFIG_ARCH_HAS_RESET_CONTROLLER=3Dy @@ -1200,20 +1317,35 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=3Dy CONFIG_OMAP_USB2=3Dm =20 # +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=3Dy + +# # Pseudo filesystems # # CONFIG_JFFS2_FS is not set =20 # +# Memory Debugging +# +# CONFIG_DEBUG_PER_CPU_MAPS is not set + +# # RCU Debugging # CONFIG_RCU_CPU_STALL_TIMEOUT=3D60 +# CONFIG_RCU_CPU_STALL_INFO is not set =20 # # Runtime Testing # CONFIG_DEBUG_IMX_UART_PORT=3D1 +CONFIG_DEBUG_LL_INCLUDE=3D"mach/debug-macro.S" +# CONFIG_DEBUG_UART_8250 is not set +CONFIG_UNCOMPRESS_INCLUDE=3D"debug/uncompress.h" CONFIG_OC_ETM=3Dy +# CONFIG_PID_IN_CONTEXTIDR is not set =20 # # Non-executable pages @@ -1256,7 +1388,6 @@ CONFIG_CRYPTO_AES_ARM_BS=3Dm # # Random Number Generation # -CONFIG_CRYPTO_DEV_MV_CESA=3Dm CONFIG_CRYPTO_DEV_OMAP_SHAM=3Dm CONFIG_CRYPTO_DEV_OMAP_AES=3Dm CONFIG_CRYPTO_DEV_PICOXCELL=3Dm @@ -1269,8 +1400,7 @@ CONFIG_CRYPTO_DEV_UX500=3Dm # # Library routines # -CONFIG_RATIONAL=3Dy CONFIG_STMP_DEVICE=3Dy CONFIG_GENERIC_ALLOCATOR=3Dy -CONFIG_GENERIC_ATOMIC64=3Dy +CONFIG_CPU_RMAP=3Dy CONFIG_DDR=3Dy diff --git a/kernel/config-armv7hl-generic b/kernel/config-armv7hl-generic deleted file mode 100644 index f3df469..0000000 --- a/kernel/config-armv7hl-generic +++ /dev/null @@ -1,311 +0,0 @@ -CONFIG_MIGHT_HAVE_PCI=3Dy -CONFIG_ARCH_HAS_CPUFREQ=3Dy -CONFIG_ARCH_HAS_BANDGAP=3Dy - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_CHIP=3Dy -CONFIG_SPARSE_IRQ=3Dy -CONFIG_ARCH_HAS_TICK_BROADCAST=3Dy -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=3Dy - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=3Dy -CONFIG_RCU_STALL_COMMON=3Dy -CONFIG_RCU_FANOUT=3D32 -CONFIG_RCU_FANOUT_LEAF=3D16 -# CONFIG_RCU_FANOUT_EXACT is not set - -# -# Kernel Performance Events And Counters -# -CONFIG_SLUB_CPU_PARTIAL=3Dy - -# -# IO Schedulers -# -CONFIG_MUTEX_SPIN_ON_OWNER=3Dy - -# -# System Type -# -CONFIG_ARCH_MULTIPLATFORM=3Dy -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_KIRKWOOD is not set - -# -# CPU Core family selection -# -CONFIG_ARCH_MULTI_V7=3Dy -CONFIG_ARCH_MULTI_V6_V7=3Dy -# CONFIG_ARCH_MULTI_CPU_AUTO is not set - -# -# OMAP Feature Selections -# -CONFIG_OMAP_MUX=3Dy -# CONFIG_OMAP_MUX_DEBUG is not set -CONFIG_OMAP_MUX_WARNINGS=3Dy -CONFIG_OMAP_32K_TIMER=3Dy -CONFIG_OMAP_DM_TIMER=3Dy -CONFIG_OMAP_PM_NOOP=3Dy -CONFIG_MACH_OMAP_GENERIC=3Dy -CONFIG_ARCH_OMAP=3Dy -CONFIG_SOC_OMAP5=3Dy -CONFIG_ARCH_OMAP2PLUS=3Dy - -# -# TI OMAP2/3/4 Specific Features -# -CONFIG_ARCH_OMAP2PLUS_TYPICAL=3Dy -CONFIG_SOC_HAS_REALTIME_COUNTER=3Dy - -# -# OMAP Legacy Platform Data Board Type -# -CONFIG_ARCH_TEGRA=3Dy - -# -# NVIDIA Tegra options -# -CONFIG_TEGRA_AHB=3Dy -# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set - -# -# Processor Type -# -CONFIG_CPU_V7=3Dy -CONFIG_CPU_32v6K=3Dy -CONFIG_CPU_32v7=3Dy -CONFIG_CPU_ABRT_EV7=3Dy -CONFIG_CPU_PABRT_V7=3Dy -CONFIG_CPU_CACHE_V7=3Dy -CONFIG_CPU_CACHE_VIPT=3Dy -CONFIG_CPU_COPY_V6=3Dy -CONFIG_CPU_TLB_V7=3Dy -CONFIG_CPU_HAS_ASID=3Dy - -# -# Processor Features -# -# CONFIG_ARM_THUMBEE is not set -CONFIG_ARM_VIRT_EXT=3Dy -CONFIG_SWP_EMULATE=3Dy -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_MIGHT_HAVE_CACHE_L2X0=3Dy -CONFIG_ARM_L1_CACHE_SHIFT_6=3Dy -CONFIG_ARM_L1_CACHE_SHIFT=3D6 -CONFIG_ARM_DMA_MEM_BUFFERABLE=3Dy -CONFIG_ARM_ERRATA_798181=3Dy -# CONFIG_ARM_ERRATA_773022 is not set -CONFIG_TI_PRIV_EDMA=3Dy - -# -# Kernel Features -# -CONFIG_SMP=3Dy -CONFIG_SMP_ON_UP=3Dy -CONFIG_ARM_CPU_TOPOLOGY=3Dy -# CONFIG_MCPM is not set -# CONFIG_BIG_LITTLE is not set -CONFIG_HOTPLUG_CPU=3Dy -CONFIG_ARCH_NR_GPIO=3D1024 -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=3Dy -CONFIG_SPLIT_PTLOCK_CPUS=3D4 - -# -# Boot options -# -# CONFIG_ARM_ATAG_DTB_COMPAT is not set - -# -# CPU Frequency scaling -# -# CONFIG_CPU_FREQ is not set - -# -# At least one emulation must be selected -# -CONFIG_VFPv3=3Dy -CONFIG_NEON=3Dy - -# -# Power management options -# -CONFIG_PM_SLEEP_SMP=3Dy - -# -# Classification -# -CONFIG_RPS=3Dy -CONFIG_RFS_ACCEL=3Dy -CONFIG_XPS=3Dy -CONFIG_NET_FLOW_LIMIT=3Dy - -# -# Bluetooth device drivers -# -# CONFIG_RFKILL_REGULATOR is not set - -# -# Generic Driver Options -# -CONFIG_SOC_BUS=3Dy - -# -# Non-8250 serial port support -# -CONFIG_I2C=3Dy - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_OMAP=3Dy - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PINCTRL=3Dy - -# -# Pin controllers -# -# CONFIG_DEBUG_PINCTRL is not set -# CONFIG_PINCTRL_SINGLE is not set -CONFIG_ARCH_REQUIRE_GPIOLIB=3Dy - -# -# Memory mapped GPIO drivers: -# -# CONFIG_GPIO_GENERIC_PLATFORM is not set - -# -# I2C GPIO expanders: -# -# CONFIG_GPIO_SX150X is not set - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MCP23S08 is not set - -# -# 1-wire Bus Masters -# -# CONFIG_HDQ_MASTER_OMAP is not set - -# -# 1-wire Slaves -# -# CONFIG_CHARGER_MANAGER is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_OMAP_USB_HOST=3Dy -CONFIG_REGULATOR=3Dy -# CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set - -# -# Multimedia core support -# -CONFIG_VIDEO_V4L2=3Dy - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_VIDEO_IR_I2C=3Dy - -# -# soc_camera sensor drivers -# -CONFIG_MEDIA_TUNER=3Dy -CONFIG_MEDIA_TUNER_SIMPLE=3Dy -CONFIG_MEDIA_TUNER_TDA8290=3Dy -CONFIG_MEDIA_TUNER_TDA827X=3Dy -CONFIG_MEDIA_TUNER_TDA18271=3Dy -CONFIG_MEDIA_TUNER_TDA9887=3Dy -CONFIG_MEDIA_TUNER_MT20XX=3Dy -CONFIG_MEDIA_TUNER_XC2028=3Dy -CONFIG_MEDIA_TUNER_XC5000=3Dy -CONFIG_MEDIA_TUNER_XC4000=3Dy -CONFIG_MEDIA_TUNER_MC44S803=3Dy - -# -# I2C HID support -# -CONFIG_USB_ARCH_HAS_EHCI=3Dy - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD_OMAP=3Dy - -# -# USB Physical Layer drivers -# -CONFIG_NOP_USB_XCEIV=3Dy -CONFIG_USB_ULPI_VIEWPORT=3Dy - -# -# Speakup console speech -# -# CONFIG_MFD_NVEC is not set - -# -# Android -# -# CONFIG_DRM_IMX is not set -CONFIG_COMMON_CLK=3Dy - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_DEBUG is not set - -# -# Hardware Spinlock drivers -# -CONFIG_ARM_ARCH_TIMER=3Dy -CONFIG_ARM_ARCH_TIMER_EVTSTREAM=3Dy -# CONFIG_OMAP_IOMMU is not set -# CONFIG_TEGRA_IOMMU_SMMU is not set - -# -# Temperature sensors -# -CONFIG_ARM_GIC=3Dy - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=3Dy - -# -# Memory Debugging -# -# CONFIG_DEBUG_PER_CPU_MAPS is not set - -# -# RCU Debugging -# -# CONFIG_RCU_CPU_STALL_INFO is not set - -# -# Runtime Testing -# -CONFIG_DEBUG_LL_INCLUDE=3D"mach/debug-macro.S" -# CONFIG_DEBUG_UART_PL01X is not set -# CONFIG_DEBUG_UART_8250 is not set -CONFIG_UNCOMPRESS_INCLUDE=3D"debug/uncompress.h" -# CONFIG_PID_IN_CONTEXTIDR is not set - -# -# Library routines -# -CONFIG_CPU_RMAP=3Dy diff --git a/kernel/config-armv7hl-lpae b/kernel/config-armv7hl-lpae index 8d6b89d..e1e6180 100644 --- a/kernel/config-armv7hl-lpae +++ b/kernel/config-armv7hl-lpae @@ -109,7 +109,6 @@ CONFIG_NR_CPUS=3D4 # CONFIG_THUMB2_KERNEL is not set CONFIG_SYS_SUPPORTS_HUGETLBFS=3Dy CONFIG_PHYS_ADDR_T_64BIT=3Dy -CONFIG_ZONE_DMA_FLAG=3D0 CONFIG_DEFAULT_MMAP_MIN_ADDR=3D32768 # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_FORCE_MAX_ZONEORDER=3D11 diff --git a/kernel/config-generic b/kernel/config-generic index 933d8ac..4eb1887 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -241,6 +241,7 @@ CONFIG_FREEZER=3Dy # # Processor type and features # +CONFIG_ZONE_DMA=3Dy CONFIG_SWIOTLB=3Dy CONFIG_IOMMU_HELPER=3Dy CONFIG_PREEMPT_NONE=3Dy @@ -253,6 +254,7 @@ CONFIG_PAGEFLAGS_EXTENDED=3Dy CONFIG_BALLOON_COMPACTION=3Dy CONFIG_COMPACTION=3Dy CONFIG_MIGRATION=3Dy +CONFIG_ZONE_DMA_FLAG=3D1 CONFIG_BOUNCE=3Dy CONFIG_KSM=3Dy CONFIG_CROSS_MEMORY_ATTACH=3Dy @@ -2176,10 +2178,12 @@ CONFIG_PTP_1588_CLOCK=3Dm # # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # +CONFIG_PINCTRL=3Dy =20 # # Pin controllers # +# CONFIG_DEBUG_PINCTRL is not set CONFIG_GPIOLIB=3Dy CONFIG_GPIO_DEVRES=3Dy # CONFIG_DEBUG_GPIO is not set @@ -3746,6 +3750,7 @@ CONFIG_DMA_ENGINE=3Dy # CONFIG_ASYNC_TX_DMA=3Dy # CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=3Dy # CONFIG_AUXDISPLAY is not set CONFIG_UIO=3Dm # CONFIG_UIO_CIF is not set @@ -3903,10 +3908,14 @@ CONFIG_USB_BTMTK=3Dm # CONFIG_DGNC is not set # CONFIG_DGAP is not set CONFIG_CLKDEV_LOOKUP=3Dy +CONFIG_HAVE_CLK_PREPARE=3Dy +CONFIG_COMMON_CLK=3Dy =20 # # Common Clock Framework # +# CONFIG_COMMON_CLK_DEBUG is not set +CONFIG_COMMON_CLK_SI5351=3Dm =20 # # Hardware Spinlock drivers @@ -4730,6 +4739,7 @@ CONFIG_BINARY_PRINTF=3Dy # CONFIG_RAID6_PQ=3Dm CONFIG_BITREVERSE=3Dy +CONFIG_RATIONAL=3Dy CONFIG_GENERIC_STRNCPY_FROM_USER=3Dy CONFIG_GENERIC_STRNLEN_USER=3Dy CONFIG_GENERIC_NET_UTILS=3Dy diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index c6b9e21..09b67c3 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -65,7 +65,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=3Dy # # Processor type and features # -CONFIG_ZONE_DMA=3Dy CONFIG_SMP=3Dy CONFIG_X86_MPPARSE=3Dy CONFIG_X86_EXTENDED_PLATFORM=3Dy @@ -133,7 +132,6 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=3Dy CONFIG_SPLIT_PTLOCK_CPUS=3D4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=3Dy CONFIG_PHYS_ADDR_T_64BIT=3Dy -CONFIG_ZONE_DMA_FLAG=3D1 CONFIG_VIRT_TO_BUS=3Dy CONFIG_MMU_NOTIFIER=3Dy CONFIG_DEFAULT_MMAP_MIN_ADDR=3D4096 @@ -537,14 +535,12 @@ CONFIG_I2C_PARPORT=3Dm # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # CONFIG_PTP_1588_CLOCK_PCH=3Dm -CONFIG_PINCTRL=3Dy =20 # # Pin controllers # # CONFIG_PINMUX is not set # CONFIG_PINCONF is not set -# CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_BAYTRAIL is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=3Dy CONFIG_GPIO_ACPI=3Dy @@ -850,7 +846,6 @@ CONFIG_DMA_ACPI=3Dy # # DMA Clients # -CONFIG_DMA_ENGINE_RAID=3Dy CONFIG_DCA=3Dm # CONFIG_VFIO is not set =20 @@ -941,13 +936,6 @@ CONFIG_INTEL_SMARTCONNECT=3Dm CONFIG_PVPANIC=3Dm CONFIG_CHROME_PLATFORMS=3Dy CONFIG_CHROMEOS_LAPTOP=3Dm -CONFIG_COMMON_CLK=3Dy - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_DEBUG is not set -CONFIG_COMMON_CLK_SI5351=3Dm =20 # # Hardware Spinlock drivers @@ -1153,7 +1141,6 @@ CONFIG_KVM_DEVICE_ASSIGNMENT=3Dy # # Library routines # -CONFIG_RATIONAL=3Dy CONFIG_GENERIC_FIND_FIRST_BIT=3Dy CONFIG_GENERIC_IOMAP=3Dy CONFIG_GENERIC_ALLOCATOR=3Dy diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 1650e89..72cb854 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ =20 name =3D kernel version =3D 3.13.2 -release =3D 1 +release =3D 2 thisapp =3D linux-%{version} =20 maintainer =3D Arne Fitzenreiter @@ -91,11 +91,8 @@ build end =20 if "%{DISTRO_ARCH}" =3D=3D "armv5tel" - # ERROR Currently all kernel images are disabled, because they - # won't build with the grsecurity patch. - # Build a kernel for Marvell Kirkwood-based devices. - build_kernel_kirkwood =3D 1 + build_kernel_default =3D 1 =20 kernel_arch =3D arm kernel_target =3D zImage @@ -133,11 +130,6 @@ build kernels +=3D lpae end =20 - # Build ARM kirkwood kernel. - if "%{build_kernel_kirkwood}" =3D=3D "1" - kernels +=3D kirkwood - end - perf_make =3D make %{MAKETUNING} -C tools/perf V=3D1 WERROR=3D0 \ NO_LIBUNWIND=3D1 HAVE_CPLUS_DEMANGLE=3D1 NO_GTK2=3D1 NO_LIBNUMA=3D1 \ NO_STRLCPY=3D1 NO_BIONIC=3D1 prefix=3D%{prefix} perfexecdir=3Dlib/perf-core @@ -584,22 +576,6 @@ packages end end =20 - if "%{build_kernel_kirkwood}" =3D=3D "1" - package kernel-kirkwood - template KERNEL - - kernel_name =3D kernel-kirkwood - kernel_release =3D %{fullver}.kirkwood - end - - package kernel-kirkwood-devel - template KERNELDEVEL - - kernel_name =3D kernel-kirkwood - kernel_release =3D %{fullver}.kirkwood - end - end - package kernel-headers summary =3D Header files of the kernel release %{fullver}. desciption =3D %{summary} diff --git a/kernel/scripts/configure b/kernel/scripts/configure index 01d6262..c12f8b1 100755 --- a/kernel/scripts/configure +++ b/kernel/scripts/configure @@ -17,7 +17,7 @@ CONFIGS=3D"${CONFIGS} i686:legacy i686:default" CONFIGS=3D"${CONFIGS} armv7hl:lpae armv7hl:default" =20 # armv5tel -CONFIGS=3D"${CONFIGS} armv5tel:versatile armv5tel:kirkwood" +CONFIGS=3D"${CONFIGS} armv5tel:default" =20 function merge_config() { local arch=3D${1} @@ -67,18 +67,14 @@ function merge_config() { ;; =20 # ARM - armv5tel:versatile) - configs=3D"${configs} config-arm-generic" - ;; - armv5tel:kirkwood) - configs=3D"${configs} config-arm-generic config-armv5tel-kirkwood" + armv5tel:default) + configs=3D"${configs} config-arm-generic config-armv5tel-default" ;; armv7hl:default) - configs=3D"${configs} config-arm-generic config-armv7hl-generic" - configs=3D"${configs} config-armv7hl-default" + configs=3D"${configs} config-arm-generic config-armv7hl-default" ;; armv7hl:lpae) - configs=3D"${configs} config-arm-generic config-armv7hl-generic" + configs=3D"${configs} config-arm-generic config-armv7hl-default" configs=3D"${configs} config-armv7hl-lpae" ;; *) @@ -192,8 +188,11 @@ function diff_configs() { =20 merge_config ${arch} ${flavour} ${filename} ${extra_configs} =20 - # Do not include i686 legacy. + # Do not include leaf configuration. case "${config}" in + armv7hl:lpae) + continue + ;; i686:legacy) continue ;; @@ -230,14 +229,6 @@ function diff_configs() { ${tmpdir}/config-${arch}-common > ${tmpdir}/config-${arch}-generic done =20 - for arch in armv7hl; do - ${SCRIPTS_DIR}/configcommon.py ${subarch_configs[${arch}]} \ - > ${tmpdir}/config-${arch}-common - - ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-arm-common \ - ${tmpdir}/config-${arch}-common > ${tmpdir}/config-${arch}-generic - done - for config in ${CONFIGS}; do arch=3D${config%:*} flavour=3D${config#*:} @@ -253,20 +244,11 @@ function diff_configs() { filename=3D${tmpdir}/config-${arch}-${flavour} =20 case "${config}" in - i686:legacy) + armv7hl:lpae|i686:legacy) # Legacy depends directly on the default configuration. - ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-i686-default \ - ${filename} > ${filename}.tmp - ;; - armv7hl:*) - # armv7hl depends on a config-armv7hl - ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${arch}-common \ + ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${arch}-default \ ${filename} > ${filename}.tmp ;; - armv5tel:versatile) - rm -f ${filename} - continue - ;; *) ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${suparch}-common \ ${filename} > ${filename}.tmp hooks/post-receive -- IPFire 3.x development tree --===============2966140961972779892==--