IPFire-SCM March 2014

ipfire-scm@lists.ipfire.org

1 participants
60 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9bf77c63d07566141a318b206f7766d445efd8b0
by git＠ipfire.org 28 Mar '14

28 Mar '14

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 <michael.tremer(a)ipfire.org> 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 => 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 => 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=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_ARM_PATCH_PHYS_VIRT=y @@ -8,6 +9,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y # IRQ subsystem # CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y CONFIG_KTIME_SCALAR=y # @@ -35,6 +37,7 @@ CONFIG_LBDAF=y # # 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=y # CONFIG_PLAT_SPEAR is not set # +# Versatile Express platform type +# +CONFIG_PLAT_ORION=y + +# # Processor Type # CONFIG_CPU_CP15=y @@ -81,9 +89,12 @@ CONFIG_CPU_CP15_MMU=y # # Processor Features # +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARM_THUMB=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_KUSER_HELPERS=y +CONFIG_OUTER_CACHE=y CONFIG_ARM_NR_BANKS=8 CONFIG_MULTI_IRQ_HANDLER=y @@ -97,6 +108,7 @@ CONFIG_PCI_SYSCALL=y # # PCI host controller drivers # +CONFIG_PCI_MVEBU=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set @@ -119,6 +131,7 @@ CONFIG_HIGHMEM=y CONFIG_HW_PERF_EVENTS=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ALIGNMENT_TRAP=y # @@ -182,7 +195,12 @@ CONFIG_CMA_AREAS=7 # # Bus devices # +CONFIG_MVEBU_MBUS=y CONFIG_ARM_CCI=y + +# +# LPDDR flash memory drivers +# CONFIG_DTC=y CONFIG_OF=y @@ -230,6 +248,7 @@ CONFIG_DM9000=m CONFIG_NET_VENDOR_FARADAY=y # CONFIG_FTMAC100 is not set # CONFIG_FTGMAC100 is not set +CONFIG_MV643XX_ETH=m # CONFIG_MLX4_EN is not set # CONFIG_MLX4_CORE is not set CONFIG_AX88796=m @@ -297,13 +316,20 @@ CONFIG_I2C_RCAR=m # # Pin controllers # +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +CONFIG_PINCTRL_MVEBU=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_OF_GPIO=y +CONFIG_GPIO_GENERIC=y # # Memory mapped GPIO drivers: # # CONFIG_GPIO_EM is not set +CONFIG_GPIO_MVEBU=y # CONFIG_GPIO_RCAR is not set # CONFIG_GPIO_GRGPIO is not set @@ -321,7 +347,9 @@ CONFIG_GPIO_BCM_KONA=y # 1-wire Slaves # # CONFIG_APM_POWER is not set +# CONFIG_CHARGER_MANAGER is not set CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_QNAP=y CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_VEXPRESS=y @@ -341,10 +369,23 @@ CONFIG_SENSORS_VEXPRESS=m # # 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=y +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +CONFIG_REGULATOR_DA9210=m +CONFIG_REGULATOR_LP8755=m +CONFIG_REGULATOR_PFUZE100=m +CONFIG_REGULATOR_VEXPRESS=m # # Media digital TV PCI Adapters @@ -404,6 +445,7 @@ CONFIG_USB_ULPI=y # # MMC/SD/SDIO Host Controller Drivers # +CONFIG_MMC_MVSDIO=m CONFIG_MMC_DW=m # CONFIG_MMC_DW_IDMAC is not set CONFIG_MMC_DW_PLTFM=m @@ -411,6 +453,11 @@ CONFIG_MMC_DW_EXYNOS=m CONFIG_MMC_DW_PCI=m # +# LED drivers +# +CONFIG_LEDS_REGULATOR=m + +# # iptables trigger is under Netfilter config (LED target) # # CONFIG_EDAC is not set @@ -418,15 +465,23 @@ CONFIG_MMC_DW_PCI=m # # on-CPU RTC drivers # +CONFIG_RTC_DRV_MV=m CONFIG_RTC_DRV_SNVS=m # # DMA Devices # +CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y # CONFIG_DW_DMAC is not set +CONFIG_MV_XOR=y CONFIG_DMA_OF=y # +# Common Clock Framework +# +CONFIG_MVEBU_CLK_COMMON=y + +# # Hardware Spinlock drivers # CONFIG_CLKSRC_OF=y @@ -435,6 +490,11 @@ CONFIG_OF_IOMMU=y # CONFIG_SHMOBILE_IOMMU is not set # +# Rpmsg drivers +# +CONFIG_MVEBU_DEVBUS=y + +# # Analog to digital converters # # CONFIG_EXYNOS_ADC is not set @@ -466,6 +526,7 @@ CONFIG_ARM_UNWIND=y CONFIG_OLD_MCOUNT=y # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_UART_PL01X is not set # # Executable Protections @@ -501,6 +562,7 @@ CONFIG_CRYPTO_AES_ARM=m # # Random Number Generation # +CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y @@ -509,3 +571,4 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_AUDIT_GENERIC=y +CONFIG_GENERIC_ATOMIC64=y 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=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 +# +CONFIG_TINY_RCU=y +# CONFIG_RCU_STALL_COMMON is not set + +# +# System Type +# +# CONFIG_ARCH_MULTIPLATFORM is not set +CONFIG_ARCH_KIRKWOOD=y + +# +# Marvell Kirkwood Implementations +# +CONFIG_KIRKWOOD_LEGACY=y +CONFIG_MACH_D2NET_V2=y +CONFIG_MACH_NET2BIG_V2=y +CONFIG_MACH_NET5BIG_V2=y +CONFIG_MACH_OPENRD=y +CONFIG_MACH_OPENRD_BASE=y +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 + +# +# Device tree entries +# +CONFIG_ARCH_KIRKWOOD_DT=y +CONFIG_MACH_MV88F6281GTW_GE_DT=y +CONFIG_PLAT_ORION_LEGACY=y + +# +# Processor Type +# +CONFIG_CPU_FEROCEON=y +# CONFIG_CPU_FEROCEON_OLD_ID is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_FEROCEON=y +CONFIG_CPU_TLB_FEROCEON=y +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 + +# +# Kernel Features +# +CONFIG_ARCH_NR_GPIO=0 +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 + +# +# Boot options +# +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set +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 +# +# 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_I2C=m + +# +# Bus devices +# +# CONFIG_MTD 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 + +# +# 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 + +# +# 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=m + +# +# 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=m +CONFIG_SERIAL_ARC=m +CONFIG_PRINTER=m +CONFIG_LP_CONSOLE=y +CONFIG_PPDEV=m +CONFIG_I2C=m +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 + +# +# Pin controllers +# +CONFIG_PINCTRL_SINGLE=m +CONFIG_PINCTRL_KIRKWOOD=y + +# +# Memory mapped GPIO drivers: +# +CONFIG_GPIO_GENERIC_PLATFORM=y + +# +# SPI GPIO expanders: +# +CONFIG_GPIO_MCP23S08=m + +# +# Native drivers +# +CONFIG_CPU_THERMAL=y +CONFIG_KIRKWOOD_THERMAL=m + +# +# Watchdog Device Drivers +# +CONFIG_ORION_WATCHDOG=m + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=m +# 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=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 + +# +# Multimedia core support +# +CONFIG_VIDEO_V4L2=m + +# +# Supported MMC/SDIO adapters +# +# CONFIG_MEDIA_PARPORT_SUPPORT is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_VIDEO_IR_I2C=m + +# +# soc_camera sensor drivers +# +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MC44S803=m + +# +# Graphics support +# +CONFIG_DRM=m +CONFIG_DRM_USB=m +CONFIG_DRM_KMS_HELPER=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_UDL=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_FB_MODE_HELPERS is not set + +# +# 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_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 + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD_ORION=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y + +# +# USB Physical Layer drivers +# +CONFIG_NOP_USB_XCEIV=m +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m +CONFIG_MMC=m + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m + +# +# LED drivers +# +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_PWM=m +CONFIG_LEDS_NS2=m +CONFIG_LEDS_NETXBIG=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_HEARTBEAT=m + +# +# Microsoft Hyper-V guest support +# +# CONFIG_PANEL is not set + +# +# Common Clock Framework +# +CONFIG_KIRKWOOD_CLK=y + +# +# Hardware Spinlock drivers +# +CONFIG_ORION_TIMER=y + +# +# Temperature sensors +# +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_PCA9685=m +CONFIG_ORION_IRQCHIP=y + +# +# 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="debug/8250.S" +CONFIG_DEBUG_UART_8250=y +CONFIG_DEBUG_UART_PHYS=0xf1012000 +CONFIG_DEBUG_UART_VIRT=0xfed12000 +CONFIG_DEBUG_UART_8250_SHIFT=2 +# CONFIG_DEBUG_UART_8250_WORD is not set +# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set +CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" + +# +# Library routines +# +CONFIG_HAS_IOPORT=y +# 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=y - -# -# General setup -# -CONFIG_BROKEN_ON_SMP=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_CHIP=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 -# -CONFIG_TINY_RCU=y -# CONFIG_RCU_STALL_COMMON is not set - -# -# System Type -# -# CONFIG_ARCH_MULTIPLATFORM is not set -# CONFIG_ARCH_VERSATILE is not set -CONFIG_ARCH_KIRKWOOD=y - -# -# Marvell Kirkwood Implementations -# -CONFIG_KIRKWOOD_LEGACY=y -CONFIG_MACH_D2NET_V2=y -CONFIG_MACH_NET2BIG_V2=y -CONFIG_MACH_NET5BIG_V2=y -CONFIG_MACH_OPENRD=y -CONFIG_MACH_OPENRD_BASE=y -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 - -# -# Device tree entries -# -CONFIG_ARCH_KIRKWOOD_DT=y -CONFIG_MACH_MV88F6281GTW_GE_DT=y -CONFIG_PLAT_ORION=y -CONFIG_PLAT_ORION_LEGACY=y - -# -# Processor Type -# -CONFIG_CPU_FEROCEON=y -# CONFIG_CPU_FEROCEON_OLD_ID is not set -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_FEROCEON=y -CONFIG_CPU_TLB_FEROCEON=y -CONFIG_CPU_USE_DOMAINS=y - -# -# Processor Features -# -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_NEED_KUSER_HELPERS=y -CONFIG_KUSER_HELPERS=y -CONFIG_OUTER_CACHE=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_PCI_MVEBU=y -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 - -# -# Kernel Features -# -CONFIG_ARCH_NR_GPIO=0 -CONFIG_SPLIT_PTLOCK_CPUS=999999 -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=0 -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_NEED_PER_CPU_KM=y -CONFIG_FORCE_MAX_ZONEORDER=11 -# CONFIG_UACCESS_WITH_MEMCPY is not set - -# -# Boot options -# -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y -# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set -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 -# -# 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_I2C=m - -# -# Bus devices -# -CONFIG_MVEBU_MBUS=y -# CONFIG_MTD 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 - -# -# 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_MV643XX_ETH=m - -# -# 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=m - -# -# 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=m -CONFIG_SERIAL_ARC=m -CONFIG_PRINTER=m -CONFIG_LP_CONSOLE=y -CONFIG_PPDEV=m -CONFIG_I2C=m -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 - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PINCTRL=y - -# -# Pin controllers -# -CONFIG_PINMUX=y -CONFIG_PINCONF=y -CONFIG_GENERIC_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_SINGLE=m -CONFIG_PINCTRL_MVEBU=y -CONFIG_PINCTRL_KIRKWOOD=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_GPIO_GENERIC=y - -# -# Memory mapped GPIO drivers: -# -CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_MVEBU=y - -# -# SPI GPIO expanders: -# -CONFIG_GPIO_MCP23S08=m - -# -# 1-wire Slaves -# -# CONFIG_CHARGER_MANAGER is not set -CONFIG_POWER_RESET_QNAP=y - -# -# Native drivers -# -CONFIG_CPU_THERMAL=y -CONFIG_KIRKWOOD_THERMAL=m - -# -# Watchdog Device Drivers -# -CONFIG_ORION_WATCHDOG=m - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=m -# CONFIG_ABX500_CORE is not set -# CONFIG_MFD_SYSCON is not set -# CONFIG_MFD_TPS65912 is not set -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=y -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_AD5398 is not set -CONFIG_REGULATOR_DA9210=m -# 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=m -CONFIG_REGULATOR_LP8755=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_PFUZE100=m -# 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=m - -# -# Multimedia core support -# -CONFIG_VIDEO_V4L2=m - -# -# Supported MMC/SDIO adapters -# -# CONFIG_MEDIA_PARPORT_SUPPORT is not set - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_VIDEO_IR_I2C=m - -# -# soc_camera sensor drivers -# -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MC44S803=m - -# -# Graphics support -# -CONFIG_DRM=m -CONFIG_DRM_USB=m -CONFIG_DRM_KMS_HELPER=m - -# -# I2C encoder or helper chips -# -CONFIG_DRM_UDL=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -# CONFIG_FB_MODE_HELPERS is not set - -# -# 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_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 - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD_ORION=y - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y - -# -# USB Physical Layer drivers -# -CONFIG_NOP_USB_XCEIV=m -CONFIG_SAMSUNG_USBPHY=m -CONFIG_SAMSUNG_USB2PHY=m -CONFIG_SAMSUNG_USB3PHY=m -CONFIG_MMC=m - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=m -CONFIG_MMC_MVSDIO=m - -# -# LED drivers -# -# CONFIG_LEDS_GPIO is not set -CONFIG_LEDS_PWM=m -CONFIG_LEDS_REGULATOR=m -CONFIG_LEDS_NS2=m -CONFIG_LEDS_NETXBIG=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGER_HEARTBEAT=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_MV=m - -# -# DMA Devices -# -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y -CONFIG_MV_XOR=y - -# -# DMA Clients -# -CONFIG_DMA_ENGINE_RAID=y - -# -# Microsoft Hyper-V guest support -# -# CONFIG_PANEL is not set - -# -# Android -# -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_DEBUG is not set -CONFIG_COMMON_CLK_SI5351=m -CONFIG_MVEBU_CLK_COMMON=y -CONFIG_KIRKWOOD_CLK=y - -# -# Hardware Spinlock drivers -# -CONFIG_ORION_TIMER=y - -# -# Rpmsg drivers -# -CONFIG_MVEBU_DEVBUS=y - -# -# Temperature sensors -# -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_PCA9685=m -CONFIG_ORION_IRQCHIP=y - -# -# 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="debug/8250.S" -# CONFIG_DEBUG_UART_PL01X is not set -CONFIG_DEBUG_UART_8250=y -CONFIG_DEBUG_UART_PHYS=0xf1012000 -CONFIG_DEBUG_UART_VIRT=0xfed12000 -CONFIG_DEBUG_UART_8250_SHIFT=2 -# CONFIG_DEBUG_UART_8250_WORD is not set -# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set -CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" - -# -# Random Number Generation -# -CONFIG_CRYPTO_DEV_MV_CESA=m - -# -# Library routines -# -CONFIG_RATIONAL=y -CONFIG_HAS_IOPORT=y -CONFIG_GENERIC_ATOMIC64=y -# 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=y CONFIG_NO_IOPORT=y -CONFIG_ZONE_DMA=y +CONFIG_ARCH_HAS_BANDGAP=y CONFIG_FIQ=y # +# IRQ subsystem +# +CONFIG_SPARSE_IRQ=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y + +# # Timers subsystem # # CONFIG_NO_HZ_IDLE is not set @@ -19,22 +27,42 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # # RCU Subsystem # +CONFIG_TREE_RCU=y +CONFIG_RCU_STALL_COMMON=y CONFIG_CONTEXT_TRACKING=y CONFIG_RCU_USER_QS=y CONFIG_CONTEXT_TRACKING_FORCE=y +CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set CONFIG_RCU_FAST_NO_HZ=y CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_NOCB_CPU_ALL=y # +# Kernel Performance Events And Counters +# +CONFIG_SLUB_CPU_PARTIAL=y + +# # IO Schedulers # CONFIG_PADATA=y +CONFIG_MUTEX_SPIN_ON_OWNER=y + +# +# System Type +# +CONFIG_ARCH_MULTIPLATFORM=y +# CONFIG_ARCH_KIRKWOOD is not set # # CPU Core family selection # CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y +# CONFIG_ARCH_MULTI_CPU_AUTO is not set CONFIG_ARCH_MVEBU=y # @@ -50,12 +78,7 @@ CONFIG_ARCH_BCM=y # # CONFIG_ARCH_BCM_MOBILE is not set CONFIG_ARCH_BCM2835=y -CONFIG_ARCH_CNS3XXX=y - -# -# CNS3XXX platform type -# -CONFIG_MACH_CNS3420VB=y +# CONFIG_ARCH_CNS3XXX is not set CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_KEYSTONE=y CONFIG_ARCH_MXC=y @@ -142,17 +165,29 @@ CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y CONFIG_POWER_AVS_OMAP=y CONFIG_POWER_AVS_OMAP_CLASS3=y CONFIG_OMAP_RESET_CLOCKS=y +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_32K_TIMER=y # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +CONFIG_OMAP_DM_TIMER=y +CONFIG_OMAP_PM_NOOP=y +CONFIG_MACH_OMAP_GENERIC=y +CONFIG_ARCH_OMAP=y # CONFIG_ARCH_OMAP2 is not set CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y +CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y +CONFIG_ARCH_OMAP2PLUS=y # # TI OMAP2/3/4 Specific Features # +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y CONFIG_SOC_HAS_OMAP2_SDRC=y +CONFIG_SOC_HAS_REALTIME_COUNTER=y CONFIG_SOC_DRA7XX=y CONFIG_SOC_OMAP3430=y CONFIG_SOC_TI81XX=y @@ -217,6 +252,7 @@ CONFIG_ARCH_ATLAS6=y CONFIG_ARCH_PRIMA2=y CONFIG_ARCH_MARCO=y CONFIG_SIRF_IRQ=y +CONFIG_ARCH_TEGRA=y # # NVIDIA Tegra options @@ -225,6 +261,8 @@ CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y CONFIG_ARCH_TEGRA_114_SOC=y CONFIG_ARCH_TEGRA_124_SOC=y +CONFIG_TEGRA_AHB=y +# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set CONFIG_ARCH_U8500=y CONFIG_UX500_SOC_DB8500=y @@ -252,7 +290,6 @@ CONFIG_ARCH_VT8500=y CONFIG_ARCH_WM8750=y CONFIG_ARCH_WM8850=y CONFIG_ARCH_ZYNQ=y -CONFIG_PLAT_ORION=y CONFIG_PLAT_VERSATILE=y CONFIG_ARM_TIMER_SP804=y @@ -262,22 +299,37 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_CPU_PJ4B=y CONFIG_CPU_V6=y CONFIG_CPU_V6K=y +CONFIG_CPU_V7=y CONFIG_CPU_32v6=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV6=y +CONFIG_CPU_ABRT_EV7=y CONFIG_CPU_PABRT_V6=y +CONFIG_CPU_PABRT_V7=y CONFIG_CPU_CACHE_V6=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y CONFIG_CPU_TLB_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y # # Processor Features # -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_VIRT_EXT=y +CONFIG_SWP_EMULATE=y # CONFIG_CPU_BIG_ENDIAN is not set -CONFIG_KUSER_HELPERS=y +# CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_DMA_CACHE_RWFO=y -CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y +CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_CACHE_L2X0=y +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y CONFIG_PJ4B_ERRATA_4742=y # CONFIG_ARM_ERRATA_326103 is not set @@ -293,7 +345,10 @@ CONFIG_ARM_ERRATA_364296=y CONFIG_ARM_ERRATA_764369=y CONFIG_PL310_ERRATA_769419=y CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_ERRATA_798181=y +# CONFIG_ARM_ERRATA_773022 is not set CONFIG_ICST=y +CONFIG_TI_PRIV_EDMA=y # # Bus support @@ -304,7 +359,6 @@ CONFIG_PCI_DOMAINS=y # # PCI host controller drivers # -CONFIG_PCI_MVEBU=y CONFIG_PCIE_DW=y CONFIG_PCI_IMX6=y CONFIG_PCI_TEGRA=y @@ -313,21 +367,34 @@ CONFIG_PCI_TEGRA=y # # Kernel Features # +CONFIG_SMP=y +CONFIG_SMP_ON_UP=y +CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y +# CONFIG_MCPM is not set +# CONFIG_BIG_LITTLE is not set CONFIG_NR_CPUS=8 +CONFIG_HOTPLUG_CPU=y CONFIG_ARM_PSCI=y -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ARCH_NR_GPIO=1024 +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_FORCE_MAX_ZONEORDER=12 # # Boot options # +# CONFIG_ARM_ATAG_DTB_COMPAT is not set CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" # +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# # CPU Idle # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y @@ -335,18 +402,35 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # # At least one emulation must be selected # +CONFIG_VFPv3=y +CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y # # Power management options # +CONFIG_PM_SLEEP_SMP=y CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y # +# Classification +# +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NET_FLOW_LIMIT=y + +# +# Bluetooth device drivers +# +# CONFIG_RFKILL_REGULATOR is not set + +# # Generic Driver Options # CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_SOC_BUS=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y @@ -354,7 +438,6 @@ CONFIG_REGMAP_MMIO=y # Bus devices # CONFIG_IMX_WEIM=y -CONFIG_MVEBU_MBUS=y CONFIG_OMAP_OCP2SCP=m CONFIG_OMAP_INTERCONNECT=y CONFIG_MTD=y @@ -494,7 +577,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_SUN4I_EMAC=m CONFIG_NET_VENDOR_FREESCALE=y CONFIG_FEC=m -CONFIG_MV643XX_ETH=m CONFIG_MVNETA=m CONFIG_SFC_MTD=y # CONFIG_TI_DAVINCI_EMAC is not set @@ -571,6 +653,7 @@ CONFIG_HW_RANDOM_BCM2835=y CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_OMAP3_ROM=m CONFIG_HW_RANDOM_MXC_RNGA=m +CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y # @@ -581,6 +664,7 @@ CONFIG_I2C_DAVINCI=m CONFIG_I2C_IMX=y CONFIG_I2C_MV64XXX=y CONFIG_I2C_NOMADIK=y +CONFIG_I2C_OMAP=y CONFIG_I2C_SIRF=y CONFIG_I2C_ST=m CONFIG_I2C_TEGRA=y @@ -590,9 +674,6 @@ CONFIG_I2C_WMT=y # # Pin controllers # -CONFIG_PINMUX=y -CONFIG_PINCONF=y -CONFIG_GENERIC_PINCONF=y CONFIG_PINCTRL_ABX500=y CONFIG_PINCTRL_AB8500=y CONFIG_PINCTRL_AB8540=y @@ -611,6 +692,7 @@ CONFIG_PINCTRL_NOMADIK=y CONFIG_PINCTRL_DB8500=y CONFIG_PINCTRL_DB8540=y CONFIG_PINCTRL_ROCKCHIP=y +# CONFIG_PINCTRL_SINGLE is not set CONFIG_PINCTRL_SIRF=y CONFIG_PINCTRL_SUNXI=y CONFIG_PINCTRL_ST=y @@ -619,21 +701,19 @@ CONFIG_PINCTRL_TEGRA20=y CONFIG_PINCTRL_TEGRA30=y CONFIG_PINCTRL_TEGRA114=y # CONFIG_PINCTRL_PALMAS is not set -CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_XP=y CONFIG_PINCTRL_WMT=y CONFIG_PINCTRL_WM8750=y CONFIG_PINCTRL_WM8850=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_DA9052 is not set # CONFIG_GPIO_DA9055 is not set # # Memory mapped GPIO drivers: # -CONFIG_GPIO_MVEBU=y +# CONFIG_GPIO_GENERIC_PLATFORM is not set CONFIG_GPIO_MXC=y CONFIG_GPIO_PL061=y # CONFIG_GPIO_XILINX is not set @@ -643,6 +723,7 @@ CONFIG_GPIO_PL061=y # CONFIG_GPIO_MC9S08DZ60=y # 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=m # CONFIG_GPIO_ADP5520 is not set # +# 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=m # 1-wire Bus Masters # CONFIG_W1_MASTER_MXC=m +# CONFIG_HDQ_MASTER_OMAP is not set # # 1-wire Slaves @@ -682,7 +769,6 @@ CONFIG_W1_MASTER_MXC=m # CONFIG_CHARGER_MAX8998 is not set # CONFIG_CHARGER_TPS65090 is not set # CONFIG_AB8500_BM is not set -CONFIG_POWER_RESET_QNAP=y # # Native drivers @@ -760,6 +846,7 @@ CONFIG_MFD_STMPE=y CONFIG_STMPE_I2C=y CONFIG_MFD_SYSCON=y CONFIG_MFD_LP8788=y +CONFIG_MFD_OMAP_USB_HOST=y CONFIG_MFD_PALMAS=y CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS6586X=y @@ -779,7 +866,6 @@ CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM8350=y CONFIG_MFD_WM8350_I2C=y CONFIG_MFD_WM8994=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_88PM800=m CONFIG_REGULATOR_88PM8607=y CONFIG_REGULATOR_AD5398=m @@ -793,7 +879,6 @@ CONFIG_REGULATOR_DA903X=m CONFIG_REGULATOR_DA9052=m CONFIG_REGULATOR_DA9055=m CONFIG_REGULATOR_DA9063=m -CONFIG_REGULATOR_DA9210=m CONFIG_REGULATOR_DBX500_PRCMU=y CONFIG_REGULATOR_DB8500_PRCMU=y CONFIG_REGULATOR_FAN53555=m @@ -802,7 +887,6 @@ CONFIG_REGULATOR_ISL6271A=m CONFIG_REGULATOR_LP3971=m CONFIG_REGULATOR_LP3972=m CONFIG_REGULATOR_LP872X=y -CONFIG_REGULATOR_LP8755=m CONFIG_REGULATOR_LP8788=y CONFIG_REGULATOR_MAX1586=m CONFIG_REGULATOR_MAX8649=m @@ -816,7 +900,6 @@ CONFIG_REGULATOR_MAX8998=m CONFIG_REGULATOR_MAX77686=m CONFIG_REGULATOR_MAX77693=m CONFIG_REGULATOR_PALMAS=m -CONFIG_REGULATOR_PFUZE100=m CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m @@ -831,13 +914,17 @@ CONFIG_REGULATOR_TPS65910=m CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_TPS80031=m CONFIG_REGULATOR_TWL4030=y -CONFIG_REGULATOR_VEXPRESS=m CONFIG_REGULATOR_WM831X=m CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_WM8994=m # +# Multimedia core support +# +CONFIG_VIDEO_V4L2=y + +# # Media drivers # # CONFIG_RC_ST is not set @@ -854,6 +941,26 @@ CONFIG_VIDEO_TI_VPE=m # CONFIG_VIDEO_TI_VPE_DEBUG is not set # +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_VIDEO_IR_I2C=y + +# +# soc_camera sensor drivers +# +CONFIG_MEDIA_TUNER=y +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA827X=y +CONFIG_MEDIA_TUNER_TDA18271=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_MEDIA_TUNER_XC4000=y +CONFIG_MEDIA_TUNER_MC44S803=y + +# # Graphics support # CONFIG_TEGRA_HOST1X=y @@ -992,9 +1099,15 @@ CONFIG_SND_SOC_WM9712=m CONFIG_SND_SOC_TPA6130A2=m # +# I2C HID support +# +CONFIG_USB_ARCH_HAS_EHCI=y + +# # USB Host Controller Drivers # CONFIG_USB_EHCI_MXC=m +CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_TEGRA=y # CONFIG_USB_CNS3XXX_EHCI is not set @@ -1008,12 +1121,14 @@ CONFIG_USB_IMX21_HCD=m # USB Physical Layer drivers # CONFIG_AB8500_USB=m +CONFIG_NOP_USB_XCEIV=y CONFIG_OMAP_CONTROL_USB=m CONFIG_OMAP_USB3=m CONFIG_SAMSUNG_USBPHY=y CONFIG_SAMSUNG_USB2PHY=y CONFIG_SAMSUNG_USB3PHY=y CONFIG_USB_MXS_PHY=m +CONFIG_USB_ULPI_VIEWPORT=y CONFIG_MMC=y # @@ -1036,7 +1151,6 @@ CONFIG_MMC_SDHCI_BCM2835=m CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_MXC=m -CONFIG_MMC_MVSDIO=m # CONFIG_MMC_DW_SOCFPGA is not set CONFIG_MMC_WMT=m @@ -1055,7 +1169,6 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_WM8350 is not set # CONFIG_LEDS_DA903X is not set # CONFIG_LEDS_DA9052 is not set -CONFIG_LEDS_REGULATOR=m # CONFIG_LEDS_ADP5520 is not set # CONFIG_LEDS_MAX8997 is not set @@ -1102,7 +1215,6 @@ CONFIG_RTC_DRV_OMAP=m CONFIG_RTC_DRV_PL030=m CONFIG_RTC_DRV_PL031=m CONFIG_RTC_DRV_VT8500=m -CONFIG_RTC_DRV_MV=m CONFIG_RTC_DRV_TEGRA=m CONFIG_RTC_DRV_MXC=m CONFIG_RTC_DRV_SIRFSOC=m @@ -1110,9 +1222,7 @@ CONFIG_RTC_DRV_SIRFSOC=m # # DMA Devices # -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y # CONFIG_AMBA_PL08X is not set -CONFIG_MV_XOR=y CONFIG_MX3_IPU=y CONFIG_MX3_IPU_IRQS=4 CONFIG_TEGRA20_APB_DMA=y @@ -1128,9 +1238,14 @@ CONFIG_TI_CPPI41=m CONFIG_DMA_VIRTUAL_CHANNELS=y # -# DMA Clients +# Speakup console speech +# +# CONFIG_MFD_NVEC is not set + +# +# Android # -CONFIG_DMA_ENGINE_RAID=y +# CONFIG_DRM_IMX is not set # # Common Clock Framework @@ -1138,12 +1253,10 @@ CONFIG_DMA_ENGINE_RAID=y # CONFIG_COMMON_CLK_WM831X is not set CONFIG_COMMON_CLK_VERSATILE=y # CONFIG_COMMON_CLK_MAX77686 is not set -CONFIG_COMMON_CLK_SI5351=m CONFIG_COMMON_CLK_S2MPS11=m CONFIG_CLK_TWL6040=m CONFIG_COMMON_CLK_AXI_CLKGEN=m CONFIG_COMMON_CLK_KEYSTONE=y -CONFIG_MVEBU_CLK_COMMON=y CONFIG_MVEBU_CLK_CPU=y CONFIG_ARMADA_370_CLK=y CONFIG_ARMADA_XP_CLK=y @@ -1163,6 +1276,8 @@ CONFIG_CADENCE_TTC_TIMER=y CONFIG_CLKSRC_NOMADIK_MTU=y CONFIG_CLKSRC_DBX500_PRCMU=y CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_GLOBAL_TIMER=y CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y CONFIG_VF_PIT_TIMER=y @@ -1170,13 +1285,14 @@ CONFIG_PL320_MBOX=y CONFIG_OMAP_MBOX=m CONFIG_OMAP2PLUS_MBOX=m CONFIG_OMAP_MBOX_KFIFO_SIZE=256 +# CONFIG_OMAP_IOMMU is not set # CONFIG_TEGRA_IOMMU_GART is not set +# CONFIG_TEGRA_IOMMU_SMMU is not set # # Rpmsg drivers # CONFIG_TI_EMIF=m -CONFIG_MVEBU_DEVBUS=y CONFIG_TEGRA20_MC=y CONFIG_TEGRA30_MC=y @@ -1190,6 +1306,7 @@ CONFIG_TEGRA30_MC=y # Temperature sensors # # CONFIG_PWM is not set +CONFIG_ARM_GIC=y CONFIG_ARM_VIC=y CONFIG_ARM_VIC_NR=2 CONFIG_ARCH_HAS_RESET_CONTROLLER=y @@ -1200,20 +1317,35 @@ CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_OMAP_USB2=m # +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y + +# # Pseudo filesystems # # CONFIG_JFFS2_FS is not set # +# Memory Debugging +# +# CONFIG_DEBUG_PER_CPU_MAPS is not set + +# # RCU Debugging # CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_CPU_STALL_INFO is not set # # Runtime Testing # CONFIG_DEBUG_IMX_UART_PORT=1 +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_UART_8250 is not set +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_OC_ETM=y +# CONFIG_PID_IN_CONTEXTIDR is not set # # Non-executable pages @@ -1256,7 +1388,6 @@ CONFIG_CRYPTO_AES_ARM_BS=m # # Random Number Generation # -CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_PICOXCELL=m @@ -1269,8 +1400,7 @@ CONFIG_CRYPTO_DEV_UX500=m # # Library routines # -CONFIG_RATIONAL=y CONFIG_STMP_DEVICE=y CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_ATOMIC64=y +CONFIG_CPU_RMAP=y CONFIG_DDR=y 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=y -CONFIG_ARCH_HAS_CPUFREQ=y -CONFIG_ARCH_HAS_BANDGAP=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_SPARSE_IRQ=y -CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y - -# -# RCU Subsystem -# -CONFIG_TREE_RCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_FANOUT=32 -CONFIG_RCU_FANOUT_LEAF=16 -# CONFIG_RCU_FANOUT_EXACT is not set - -# -# Kernel Performance Events And Counters -# -CONFIG_SLUB_CPU_PARTIAL=y - -# -# IO Schedulers -# -CONFIG_MUTEX_SPIN_ON_OWNER=y - -# -# System Type -# -CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_KIRKWOOD is not set - -# -# CPU Core family selection -# -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MULTI_V6_V7=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set - -# -# OMAP Feature Selections -# -CONFIG_OMAP_MUX=y -# CONFIG_OMAP_MUX_DEBUG is not set -CONFIG_OMAP_MUX_WARNINGS=y -CONFIG_OMAP_32K_TIMER=y -CONFIG_OMAP_DM_TIMER=y -CONFIG_OMAP_PM_NOOP=y -CONFIG_MACH_OMAP_GENERIC=y -CONFIG_ARCH_OMAP=y -CONFIG_SOC_OMAP5=y -CONFIG_ARCH_OMAP2PLUS=y - -# -# TI OMAP2/3/4 Specific Features -# -CONFIG_ARCH_OMAP2PLUS_TYPICAL=y -CONFIG_SOC_HAS_REALTIME_COUNTER=y - -# -# OMAP Legacy Platform Data Board Type -# -CONFIG_ARCH_TEGRA=y - -# -# NVIDIA Tegra options -# -CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set - -# -# Processor Type -# -CONFIG_CPU_V7=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_HAS_ASID=y - -# -# Processor Features -# -# CONFIG_ARM_THUMBEE is not set -CONFIG_ARM_VIRT_EXT=y -CONFIG_SWP_EMULATE=y -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_ARM_L1_CACHE_SHIFT_6=y -CONFIG_ARM_L1_CACHE_SHIFT=6 -CONFIG_ARM_DMA_MEM_BUFFERABLE=y -CONFIG_ARM_ERRATA_798181=y -# CONFIG_ARM_ERRATA_773022 is not set -CONFIG_TI_PRIV_EDMA=y - -# -# Kernel Features -# -CONFIG_SMP=y -CONFIG_SMP_ON_UP=y -CONFIG_ARM_CPU_TOPOLOGY=y -# CONFIG_MCPM is not set -# CONFIG_BIG_LITTLE is not set -CONFIG_HOTPLUG_CPU=y -CONFIG_ARCH_NR_GPIO=1024 -CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_SPLIT_PTLOCK_CPUS=4 - -# -# 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=y -CONFIG_NEON=y - -# -# Power management options -# -CONFIG_PM_SLEEP_SMP=y - -# -# Classification -# -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_NET_FLOW_LIMIT=y - -# -# Bluetooth device drivers -# -# CONFIG_RFKILL_REGULATOR is not set - -# -# Generic Driver Options -# -CONFIG_SOC_BUS=y - -# -# Non-8250 serial port support -# -CONFIG_I2C=y - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_OMAP=y - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PINCTRL=y - -# -# Pin controllers -# -# CONFIG_DEBUG_PINCTRL is not set -# CONFIG_PINCTRL_SINGLE is not set -CONFIG_ARCH_REQUIRE_GPIOLIB=y - -# -# 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=y -CONFIG_REGULATOR=y -# 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=y - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_VIDEO_IR_I2C=y - -# -# soc_camera sensor drivers -# -CONFIG_MEDIA_TUNER=y -CONFIG_MEDIA_TUNER_SIMPLE=y -CONFIG_MEDIA_TUNER_TDA8290=y -CONFIG_MEDIA_TUNER_TDA827X=y -CONFIG_MEDIA_TUNER_TDA18271=y -CONFIG_MEDIA_TUNER_TDA9887=y -CONFIG_MEDIA_TUNER_MT20XX=y -CONFIG_MEDIA_TUNER_XC2028=y -CONFIG_MEDIA_TUNER_XC5000=y -CONFIG_MEDIA_TUNER_XC4000=y -CONFIG_MEDIA_TUNER_MC44S803=y - -# -# I2C HID support -# -CONFIG_USB_ARCH_HAS_EHCI=y - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD_OMAP=y - -# -# USB Physical Layer drivers -# -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_ULPI_VIEWPORT=y - -# -# Speakup console speech -# -# CONFIG_MFD_NVEC is not set - -# -# Android -# -# CONFIG_DRM_IMX is not set -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_DEBUG is not set - -# -# Hardware Spinlock drivers -# -CONFIG_ARM_ARCH_TIMER=y -CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -# CONFIG_OMAP_IOMMU is not set -# CONFIG_TEGRA_IOMMU_SMMU is not set - -# -# Temperature sensors -# -CONFIG_ARM_GIC=y - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y - -# -# 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="mach/debug-macro.S" -# CONFIG_DEBUG_UART_PL01X is not set -# CONFIG_DEBUG_UART_8250 is not set -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -# CONFIG_PID_IN_CONTEXTIDR is not set - -# -# Library routines -# -CONFIG_CPU_RMAP=y 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=4 # CONFIG_THUMB2_KERNEL is not set CONFIG_SYS_SUPPORTS_HUGETLBFS=y CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=0 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_FORCE_MAX_ZONEORDER=11 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=y # # Processor type and features # +CONFIG_ZONE_DMA=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_PREEMPT_NONE=y @@ -253,6 +254,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y +CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_KSM=y CONFIG_CROSS_MEMORY_ATTACH=y @@ -2176,10 +2178,12 @@ CONFIG_PTP_1588_CLOCK=m # # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # +CONFIG_PINCTRL=y # # Pin controllers # +# CONFIG_DEBUG_PINCTRL is not set CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y # CONFIG_DEBUG_GPIO is not set @@ -3746,6 +3750,7 @@ CONFIG_DMA_ENGINE=y # CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y # CONFIG_AUXDISPLAY is not set CONFIG_UIO=m # CONFIG_UIO_CIF is not set @@ -3903,10 +3908,14 @@ CONFIG_USB_BTMTK=m # CONFIG_DGNC is not set # CONFIG_DGAP is not set CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y # # Common Clock Framework # +# CONFIG_COMMON_CLK_DEBUG is not set +CONFIG_COMMON_CLK_SI5351=m # # Hardware Spinlock drivers @@ -4730,6 +4739,7 @@ CONFIG_BINARY_PRINTF=y # CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y +CONFIG_RATIONAL=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_NET_UTILS=y 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=y # # Processor type and features # -CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_MPPARSE=y CONFIG_X86_EXTENDED_PLATFORM=y @@ -133,7 +132,6 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=1 CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -537,14 +535,12 @@ CONFIG_I2C_PARPORT=m # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # CONFIG_PTP_1588_CLOCK_PCH=m -CONFIG_PINCTRL=y # # 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=y CONFIG_GPIO_ACPI=y @@ -850,7 +846,6 @@ CONFIG_DMA_ACPI=y # # DMA Clients # -CONFIG_DMA_ENGINE_RAID=y CONFIG_DCA=m # CONFIG_VFIO is not set @@ -941,13 +936,6 @@ CONFIG_INTEL_SMARTCONNECT=m CONFIG_PVPANIC=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_DEBUG is not set -CONFIG_COMMON_CLK_SI5351=m # # Hardware Spinlock drivers @@ -1153,7 +1141,6 @@ CONFIG_KVM_DEVICE_ASSIGNMENT=y # # Library routines # -CONFIG_RATIONAL=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_ALLOCATOR=y 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 @@ name = kernel version = 3.13.2 -release = 1 +release = 2 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -91,11 +91,8 @@ build end if "%{DISTRO_ARCH}" == "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 = 1 + build_kernel_default = 1 kernel_arch = arm kernel_target = zImage @@ -133,11 +130,6 @@ build kernels += lpae end - # Build ARM kirkwood kernel. - if "%{build_kernel_kirkwood}" == "1" - kernels += kirkwood - end - perf_make = make %{MAKETUNING} -C tools/perf V=1 WERROR=0 \ NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 \ NO_STRLCPY=1 NO_BIONIC=1 prefix=%{prefix} perfexecdir=lib/perf-core @@ -584,22 +576,6 @@ packages end end - if "%{build_kernel_kirkwood}" == "1" - package kernel-kirkwood - template KERNEL - - kernel_name = kernel-kirkwood - kernel_release = %{fullver}.kirkwood - end - - package kernel-kirkwood-devel - template KERNELDEVEL - - kernel_name = kernel-kirkwood - kernel_release = %{fullver}.kirkwood - end - end - package kernel-headers summary = Header files of the kernel release %{fullver}. desciption = %{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="${CONFIGS} i686:legacy i686:default" CONFIGS="${CONFIGS} armv7hl:lpae armv7hl:default" # armv5tel -CONFIGS="${CONFIGS} armv5tel:versatile armv5tel:kirkwood" +CONFIGS="${CONFIGS} armv5tel:default" function merge_config() { local arch=${1} @@ -67,18 +67,14 @@ function merge_config() { ;; # ARM - armv5tel:versatile) - configs="${configs} config-arm-generic" - ;; - armv5tel:kirkwood) - configs="${configs} config-arm-generic config-armv5tel-kirkwood" + armv5tel:default) + configs="${configs} config-arm-generic config-armv5tel-default" ;; armv7hl:default) - configs="${configs} config-arm-generic config-armv7hl-generic" - configs="${configs} config-armv7hl-default" + configs="${configs} config-arm-generic config-armv7hl-default" ;; armv7hl:lpae) - configs="${configs} config-arm-generic config-armv7hl-generic" + configs="${configs} config-arm-generic config-armv7hl-default" configs="${configs} config-armv7hl-lpae" ;; *) @@ -192,8 +188,11 @@ function diff_configs() { merge_config ${arch} ${flavour} ${filename} ${extra_configs} - # 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 - 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=${config%:*} flavour=${config#*:} @@ -253,20 +244,11 @@ function diff_configs() { filename=${tmpdir}/config-${arch}-${flavour} 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

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 70c926e75bc83d60490d5c1ce9d8d62ed64d284b
by git＠ipfire.org 27 Mar '14

27 Mar '14

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 2.x development tree". The branch, next has been updated via 70c926e75bc83d60490d5c1ce9d8d62ed64d284b (commit) via a3f2459f8fb71a49935902f167de08bbd8b85fd3 (commit) via 1e4b7130e1e0a05ae5c939122d6f88708bbf8531 (commit) via 38ca33d110b4516f927e866a37db59e596f4b6a4 (commit) from 90b0389a90b58695a05e419e9098b96cac66e003 (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 70c926e75bc83d60490d5c1ce9d8d62ed64d284b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 27 15:08:17 2014 +0100 firewall: Create mangle chain NAT_DESTINATION to silence error messages when updating. commit a3f2459f8fb71a49935902f167de08bbd8b85fd3 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Mar 27 11:58:48 2014 +0100 Firewall: fix Update from core 75 to 76 commit 1e4b7130e1e0a05ae5c939122d6f88708bbf8531 Merge: 38ca33d 90b0389 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 27 15:07:26 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 38ca33d110b4516f927e866a37db59e596f4b6a4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 27 11:36:12 2014 +0100 cups: Fix rootfile. Basically, include just everything. ----------------------------------------------------------------------- Summary of changes: config/firewall/convert-outgoingfw | 5 + config/rootfiles/common/configroot | 1 + config/rootfiles/core/76/filelists/firewall | 1 + config/rootfiles/core/76/update.sh | 5 + config/rootfiles/packages/cups | 444 ++++++++++++++-------------- lfs/configroot | 1 + lfs/cups | 2 +- 7 files changed, 236 insertions(+), 223 deletions(-) Difference in files: diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw index ea49375..2f9b74c 100755 --- a/config/firewall/convert-outgoingfw +++ b/config/firewall/convert-outgoingfw @@ -78,6 +78,11 @@ else if (! -s "$outfwsettings") { print "Empty DMZ configuration file. Nothing to do. Exiting...\n"; + #Fill the firewall settings file + open (SETTINGS, ">/var/ipfire/firewall/settings"); + print SETTINGS "POLICY=MODE2\n"; + print SETTINGS "POLICY1=MODE2\n"; + close (SETTINGS); exit(0); } diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index f509370..b5de989 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -63,6 +63,7 @@ var/ipfire/fwhosts #var/ipfire/fwhosts/customnetworks #var/ipfire/fwhosts/customservicegrp #var/ipfire/fwhosts/customservices +#var/ipfire/fwhosts/customservices.default #var/ipfire/fwhosts/icmp-types var/ipfire/fwlogs #var/ipfire/fwlogs/ipsettings diff --git a/config/rootfiles/core/76/filelists/firewall b/config/rootfiles/core/76/filelists/firewall index e770307..6eeaeae 100644 --- a/config/rootfiles/core/76/filelists/firewall +++ b/config/rootfiles/core/76/filelists/firewall @@ -11,3 +11,4 @@ usr/sbin/firewall-policy var/ipfire/firewall/p2protocols var/ipfire/fwhosts/icmp-types var/ipfire/menu.d/50-firewall.menu +var/ipfire/fwhosts/customservices.default diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh index a9055d3..038adcf 100644 --- a/config/rootfiles/core/76/update.sh +++ b/config/rootfiles/core/76/update.sh @@ -279,6 +279,7 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi /sbin/iptables -N POLICYOUT 2>/dev/null /sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null /sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null +/sbin/iptables -t mangle -N NAT_DESTINATION 2>/dev/null # Create config files for firewall and fix permissions. touch /var/ipfire/firewall/config @@ -291,6 +292,10 @@ touch /var/ipfire/fwhosts/customgroups touch /var/ipfire/fwhosts/customservices touch /var/ipfire/fwhosts/customservicegrp +if [ ! -s "/var/ipfire/fwhosts/customservices" ];then + cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices +fi + # Fix ownership. chown -R nobody:nobody /var/ipfire/firewall chown -R nobody:nobody /var/ipfire/fwhosts diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 7693e15..3acbcac 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -49,8 +49,8 @@ usr/bin/ppdpo #usr/include/cups/sidechannel.h #usr/include/cups/transcode.h #usr/include/cups/versioning.h -#usr/lib/cups -#usr/lib/cups/backend +usr/lib/cups +usr/lib/cups/backend usr/lib/cups/backend/http usr/lib/cups/backend/https usr/lib/cups/backend/ipp @@ -60,19 +60,19 @@ usr/lib/cups/backend/smb usr/lib/cups/backend/snmp usr/lib/cups/backend/socket usr/lib/cups/backend/usb -#usr/lib/cups/cgi-bin +usr/lib/cups/cgi-bin usr/lib/cups/cgi-bin/admin.cgi usr/lib/cups/cgi-bin/classes.cgi usr/lib/cups/cgi-bin/help.cgi usr/lib/cups/cgi-bin/jobs.cgi usr/lib/cups/cgi-bin/printers.cgi -#usr/lib/cups/daemon +usr/lib/cups/daemon usr/lib/cups/daemon/cups-deviced usr/lib/cups/daemon/cups-driverd usr/lib/cups/daemon/cups-exec usr/lib/cups/daemon/cups-lpd usr/lib/cups/driver -#usr/lib/cups/filter +usr/lib/cups/filter usr/lib/cups/filter/commandtops usr/lib/cups/filter/gziptoany usr/lib/cups/filter/pstops @@ -81,21 +81,21 @@ usr/lib/cups/filter/rastertoepson usr/lib/cups/filter/rastertohp usr/lib/cups/filter/rastertolabel usr/lib/cups/filter/rastertopwg -#usr/lib/cups/monitor +usr/lib/cups/monitor usr/lib/cups/monitor/bcp usr/lib/cups/monitor/tbcp -#usr/lib/cups/notifier +usr/lib/cups/notifier usr/lib/cups/notifier/mailto usr/lib/cups/notifier/rss -usr/lib/libcups.so +#usr/lib/libcups.so usr/lib/libcups.so.2 -usr/lib/libcupscgi.so +#usr/lib/libcupscgi.so usr/lib/libcupscgi.so.1 -usr/lib/libcupsimage.so +#usr/lib/libcupsimage.so usr/lib/libcupsimage.so.2 -usr/lib/libcupsmime.so +#usr/lib/libcupsmime.so usr/lib/libcupsmime.so.1 -usr/lib/libcupsppdc.so +#usr/lib/libcupsppdc.so usr/lib/libcupsppdc.so.1 usr/sbin/accept usr/sbin/cupsaccept @@ -111,19 +111,19 @@ usr/sbin/lpc usr/sbin/lpinfo usr/sbin/lpmove usr/sbin/reject -#usr/share/cups -#usr/share/cups/banners +usr/share/cups +usr/share/cups/banners usr/share/cups/banners/classified usr/share/cups/banners/confidential usr/share/cups/banners/secret usr/share/cups/banners/standard usr/share/cups/banners/topsecret usr/share/cups/banners/unclassified -#usr/share/cups/data +usr/share/cups/data usr/share/cups/data/testprint -#usr/share/cups/drv +usr/share/cups/drv usr/share/cups/drv/sample.drv -#usr/share/cups/examples +usr/share/cups/examples usr/share/cups/examples/color.drv usr/share/cups/examples/constraint.drv usr/share/cups/examples/custom.drv @@ -135,7 +135,7 @@ usr/share/cups/examples/postscript.drv usr/share/cups/examples/r300-basic.drv usr/share/cups/examples/r300-colorman.drv usr/share/cups/examples/r300-remote.drv -#usr/share/cups/ipptool +usr/share/cups/ipptool usr/share/cups/ipptool/color.jpg usr/share/cups/ipptool/create-printer-subscription.test usr/share/cups/ipptool/document-a4.pdf @@ -166,19 +166,19 @@ usr/share/cups/ipptool/testfile.pdf usr/share/cups/ipptool/testfile.ps usr/share/cups/ipptool/testfile.txt usr/share/cups/ipptool/validate-job.test -#usr/share/cups/mime +usr/share/cups/mime usr/share/cups/mime/mime.convs usr/share/cups/mime/mime.types -#usr/share/cups/model -#usr/share/cups/ppdc -#usr/share/cups/ppdc/epson.h +usr/share/cups/model +usr/share/cups/ppdc +usr/share/cups/ppdc/epson.h usr/share/cups/ppdc/font.defs -#usr/share/cups/ppdc/hp.h -#usr/share/cups/ppdc/label.h +usr/share/cups/ppdc/hp.h +usr/share/cups/ppdc/label.h usr/share/cups/ppdc/media.defs usr/share/cups/ppdc/raster.defs usr/share/cups/profiles -#usr/share/cups/templates +usr/share/cups/templates usr/share/cups/templates/add-class.tmpl usr/share/cups/templates/add-printer.tmpl usr/share/cups/templates/add-rss-subscription.tmpl @@ -559,77 +559,77 @@ usr/share/cups/templates/it/subscription-canceled.tmpl usr/share/cups/templates/it/test-page.tmpl usr/share/cups/templates/it/trailer.tmpl usr/share/cups/templates/it/users.tmpl -#usr/share/cups/templates/ja -#usr/share/cups/templates/ja/add-class.tmpl -#usr/share/cups/templates/ja/add-printer.tmpl -#usr/share/cups/templates/ja/add-rss-subscription.tmpl -#usr/share/cups/templates/ja/admin.tmpl -#usr/share/cups/templates/ja/choose-device.tmpl -#usr/share/cups/templates/ja/choose-make.tmpl -#usr/share/cups/templates/ja/choose-model.tmpl -#usr/share/cups/templates/ja/choose-serial.tmpl -#usr/share/cups/templates/ja/choose-uri.tmpl -#usr/share/cups/templates/ja/class-added.tmpl -#usr/share/cups/templates/ja/class-confirm.tmpl -#usr/share/cups/templates/ja/class-deleted.tmpl -#usr/share/cups/templates/ja/class-jobs-header.tmpl -#usr/share/cups/templates/ja/class-modified.tmpl -#usr/share/cups/templates/ja/class.tmpl -#usr/share/cups/templates/ja/classes-header.tmpl -#usr/share/cups/templates/ja/classes.tmpl -#usr/share/cups/templates/ja/command.tmpl -#usr/share/cups/templates/ja/edit-config.tmpl -#usr/share/cups/templates/ja/error-op.tmpl -#usr/share/cups/templates/ja/error.tmpl -#usr/share/cups/templates/ja/header.tmpl -#usr/share/cups/templates/ja/help-header.tmpl -#usr/share/cups/templates/ja/help-printable.tmpl -#usr/share/cups/templates/ja/help-trailer.tmpl -#usr/share/cups/templates/ja/job-cancel.tmpl -#usr/share/cups/templates/ja/job-hold.tmpl -#usr/share/cups/templates/ja/job-move.tmpl -#usr/share/cups/templates/ja/job-moved.tmpl -#usr/share/cups/templates/ja/job-release.tmpl -#usr/share/cups/templates/ja/job-restart.tmpl -#usr/share/cups/templates/ja/jobs-header.tmpl -#usr/share/cups/templates/ja/jobs.tmpl -#usr/share/cups/templates/ja/list-available-printers.tmpl -#usr/share/cups/templates/ja/modify-class.tmpl -#usr/share/cups/templates/ja/modify-printer.tmpl -#usr/share/cups/templates/ja/norestart.tmpl -#usr/share/cups/templates/ja/option-boolean.tmpl -#usr/share/cups/templates/ja/option-conflict.tmpl -#usr/share/cups/templates/ja/option-header.tmpl -#usr/share/cups/templates/ja/option-pickmany.tmpl -#usr/share/cups/templates/ja/option-pickone.tmpl -#usr/share/cups/templates/ja/option-trailer.tmpl -#usr/share/cups/templates/ja/pager.tmpl -#usr/share/cups/templates/ja/printer-accept.tmpl -#usr/share/cups/templates/ja/printer-added.tmpl -#usr/share/cups/templates/ja/printer-configured.tmpl -#usr/share/cups/templates/ja/printer-confirm.tmpl -#usr/share/cups/templates/ja/printer-default.tmpl -#usr/share/cups/templates/ja/printer-deleted.tmpl -#usr/share/cups/templates/ja/printer-jobs-header.tmpl -#usr/share/cups/templates/ja/printer-modified.tmpl -#usr/share/cups/templates/ja/printer-purge.tmpl -#usr/share/cups/templates/ja/printer-reject.tmpl -#usr/share/cups/templates/ja/printer-start.tmpl -#usr/share/cups/templates/ja/printer-stop.tmpl -#usr/share/cups/templates/ja/printer.tmpl -#usr/share/cups/templates/ja/printers-header.tmpl -#usr/share/cups/templates/ja/printers.tmpl -#usr/share/cups/templates/ja/restart.tmpl -#usr/share/cups/templates/ja/samba-export.tmpl -#usr/share/cups/templates/ja/samba-exported.tmpl -#usr/share/cups/templates/ja/search.tmpl -#usr/share/cups/templates/ja/set-printer-options-header.tmpl -#usr/share/cups/templates/ja/set-printer-options-trailer.tmpl -#usr/share/cups/templates/ja/subscription-added.tmpl -#usr/share/cups/templates/ja/subscription-canceled.tmpl -#usr/share/cups/templates/ja/test-page.tmpl -#usr/share/cups/templates/ja/trailer.tmpl -#usr/share/cups/templates/ja/users.tmpl +usr/share/cups/templates/ja +usr/share/cups/templates/ja/add-class.tmpl +usr/share/cups/templates/ja/add-printer.tmpl +usr/share/cups/templates/ja/add-rss-subscription.tmpl +usr/share/cups/templates/ja/admin.tmpl +usr/share/cups/templates/ja/choose-device.tmpl +usr/share/cups/templates/ja/choose-make.tmpl +usr/share/cups/templates/ja/choose-model.tmpl +usr/share/cups/templates/ja/choose-serial.tmpl +usr/share/cups/templates/ja/choose-uri.tmpl +usr/share/cups/templates/ja/class-added.tmpl +usr/share/cups/templates/ja/class-confirm.tmpl +usr/share/cups/templates/ja/class-deleted.tmpl +usr/share/cups/templates/ja/class-jobs-header.tmpl +usr/share/cups/templates/ja/class-modified.tmpl +usr/share/cups/templates/ja/class.tmpl +usr/share/cups/templates/ja/classes-header.tmpl +usr/share/cups/templates/ja/classes.tmpl +usr/share/cups/templates/ja/command.tmpl +usr/share/cups/templates/ja/edit-config.tmpl +usr/share/cups/templates/ja/error-op.tmpl +usr/share/cups/templates/ja/error.tmpl +usr/share/cups/templates/ja/header.tmpl +usr/share/cups/templates/ja/help-header.tmpl +usr/share/cups/templates/ja/help-printable.tmpl +usr/share/cups/templates/ja/help-trailer.tmpl +usr/share/cups/templates/ja/job-cancel.tmpl +usr/share/cups/templates/ja/job-hold.tmpl +usr/share/cups/templates/ja/job-move.tmpl +usr/share/cups/templates/ja/job-moved.tmpl +usr/share/cups/templates/ja/job-release.tmpl +usr/share/cups/templates/ja/job-restart.tmpl +usr/share/cups/templates/ja/jobs-header.tmpl +usr/share/cups/templates/ja/jobs.tmpl +usr/share/cups/templates/ja/list-available-printers.tmpl +usr/share/cups/templates/ja/modify-class.tmpl +usr/share/cups/templates/ja/modify-printer.tmpl +usr/share/cups/templates/ja/norestart.tmpl +usr/share/cups/templates/ja/option-boolean.tmpl +usr/share/cups/templates/ja/option-conflict.tmpl +usr/share/cups/templates/ja/option-header.tmpl +usr/share/cups/templates/ja/option-pickmany.tmpl +usr/share/cups/templates/ja/option-pickone.tmpl +usr/share/cups/templates/ja/option-trailer.tmpl +usr/share/cups/templates/ja/pager.tmpl +usr/share/cups/templates/ja/printer-accept.tmpl +usr/share/cups/templates/ja/printer-added.tmpl +usr/share/cups/templates/ja/printer-configured.tmpl +usr/share/cups/templates/ja/printer-confirm.tmpl +usr/share/cups/templates/ja/printer-default.tmpl +usr/share/cups/templates/ja/printer-deleted.tmpl +usr/share/cups/templates/ja/printer-jobs-header.tmpl +usr/share/cups/templates/ja/printer-modified.tmpl +usr/share/cups/templates/ja/printer-purge.tmpl +usr/share/cups/templates/ja/printer-reject.tmpl +usr/share/cups/templates/ja/printer-start.tmpl +usr/share/cups/templates/ja/printer-stop.tmpl +usr/share/cups/templates/ja/printer.tmpl +usr/share/cups/templates/ja/printers-header.tmpl +usr/share/cups/templates/ja/printers.tmpl +usr/share/cups/templates/ja/restart.tmpl +usr/share/cups/templates/ja/samba-export.tmpl +usr/share/cups/templates/ja/samba-exported.tmpl +usr/share/cups/templates/ja/search.tmpl +usr/share/cups/templates/ja/set-printer-options-header.tmpl +usr/share/cups/templates/ja/set-printer-options-trailer.tmpl +usr/share/cups/templates/ja/subscription-added.tmpl +usr/share/cups/templates/ja/subscription-canceled.tmpl +usr/share/cups/templates/ja/test-page.tmpl +usr/share/cups/templates/ja/trailer.tmpl +usr/share/cups/templates/ja/users.tmpl usr/share/cups/templates/job-cancel.tmpl usr/share/cups/templates/job-hold.tmpl usr/share/cups/templates/job-move.tmpl @@ -638,10 +638,10 @@ usr/share/cups/templates/job-release.tmpl usr/share/cups/templates/job-restart.tmpl usr/share/cups/templates/jobs-header.tmpl usr/share/cups/templates/jobs.tmpl -#usr/share/cups/templates/list-available-printers.tmpl +usr/share/cups/templates/list-available-printers.tmpl usr/share/cups/templates/modify-class.tmpl usr/share/cups/templates/modify-printer.tmpl -#usr/share/cups/templates/norestart.tmpl +usr/share/cups/templates/norestart.tmpl usr/share/cups/templates/option-boolean.tmpl usr/share/cups/templates/option-conflict.tmpl usr/share/cups/templates/option-header.tmpl @@ -748,133 +748,133 @@ usr/share/cups/templates/trailer.tmpl usr/share/cups/templates/users.tmpl usr/share/cups/usb usr/share/cups/usb/org.cups.usb-quirks -#usr/share/doc/cups -#usr/share/doc/cups/ca -#usr/share/doc/cups/ca/index.html -#usr/share/doc/cups/cs -#usr/share/doc/cups/cs/index.html -#usr/share/doc/cups/cups-printable.css -#usr/share/doc/cups/cups.css -#usr/share/doc/cups/es -#usr/share/doc/cups/es/index.html -#usr/share/doc/cups/fr -#usr/share/doc/cups/fr/index.html +usr/share/doc/cups +usr/share/doc/cups/ca +usr/share/doc/cups/ca/index.html +usr/share/doc/cups/cs +usr/share/doc/cups/cs/index.html +usr/share/doc/cups/cups-printable.css +usr/share/doc/cups/cups.css +usr/share/doc/cups/es +usr/share/doc/cups/es/index.html +usr/share/doc/cups/fr +usr/share/doc/cups/fr/index.html usr/share/doc/cups/help -#usr/share/doc/cups/help/accounting.html -#usr/share/doc/cups/help/api-array.html -#usr/share/doc/cups/help/api-cgi.html -#usr/share/doc/cups/help/api-cups.html -#usr/share/doc/cups/help/api-driver.html -#usr/share/doc/cups/help/api-filedir.html -#usr/share/doc/cups/help/api-filter.html -#usr/share/doc/cups/help/api-httpipp.html -#usr/share/doc/cups/help/api-mime.html -#usr/share/doc/cups/help/api-overview.html -#usr/share/doc/cups/help/api-ppd.html -#usr/share/doc/cups/help/api-ppdc.html -#usr/share/doc/cups/help/api-raster.html -#usr/share/doc/cups/help/cgi.html -#usr/share/doc/cups/help/glossary.html -#usr/share/doc/cups/help/kerberos.html -#usr/share/doc/cups/help/license.html -#usr/share/doc/cups/help/man-backend.html -#usr/share/doc/cups/help/man-cancel.html -#usr/share/doc/cups/help/man-cups-config.html -#usr/share/doc/cups/help/man-cups-lpd.html -#usr/share/doc/cups/help/man-cups-snmp.html -#usr/share/doc/cups/help/man-cupsaccept.html -#usr/share/doc/cups/help/man-cupsaddsmb.html -#usr/share/doc/cups/help/man-cupsd.html -#usr/share/doc/cups/help/man-cupsenable.html -#usr/share/doc/cups/help/man-cupstestdsc.html -#usr/share/doc/cups/help/man-cupstestppd.html -#usr/share/doc/cups/help/man-filter.html -#usr/share/doc/cups/help/man-ipptool.html -#usr/share/doc/cups/help/man-ipptoolfile.html -#usr/share/doc/cups/help/man-lp.html -#usr/share/doc/cups/help/man-lpadmin.html -#usr/share/doc/cups/help/man-lpc.html -#usr/share/doc/cups/help/man-lpinfo.html -#usr/share/doc/cups/help/man-lpmove.html -#usr/share/doc/cups/help/man-lpoptions.html -#usr/share/doc/cups/help/man-lppasswd.html -#usr/share/doc/cups/help/man-lpq.html -#usr/share/doc/cups/help/man-lpr.html -#usr/share/doc/cups/help/man-lprm.html -#usr/share/doc/cups/help/man-lpstat.html -#usr/share/doc/cups/help/man-mime.convs.html -#usr/share/doc/cups/help/man-mime.types.html -#usr/share/doc/cups/help/man-notifier.html -#usr/share/doc/cups/help/man-ppdc.html -#usr/share/doc/cups/help/man-ppdhtml.html -#usr/share/doc/cups/help/man-ppdi.html -#usr/share/doc/cups/help/man-ppdmerge.html -#usr/share/doc/cups/help/man-ppdpo.html -#usr/share/doc/cups/help/network.html -#usr/share/doc/cups/help/options.html -#usr/share/doc/cups/help/overview.html -#usr/share/doc/cups/help/policies.html -#usr/share/doc/cups/help/postscript-driver.html -#usr/share/doc/cups/help/ppd-compiler.html -#usr/share/doc/cups/help/raster-driver.html -#usr/share/doc/cups/help/ref-access_log.html -#usr/share/doc/cups/help/ref-classes-conf.html -#usr/share/doc/cups/help/ref-client-conf.html -#usr/share/doc/cups/help/ref-cups-files-conf.html -#usr/share/doc/cups/help/ref-cupsd-conf.html -#usr/share/doc/cups/help/ref-error_log.html -#usr/share/doc/cups/help/ref-mailto-conf.html -#usr/share/doc/cups/help/ref-page_log.html -#usr/share/doc/cups/help/ref-ppdcfile.html -#usr/share/doc/cups/help/ref-printers-conf.html -#usr/share/doc/cups/help/ref-snmp-conf.html -#usr/share/doc/cups/help/ref-subscriptions-conf.html -#usr/share/doc/cups/help/security.html -#usr/share/doc/cups/help/sharing.html -#usr/share/doc/cups/help/spec-banner.html -#usr/share/doc/cups/help/spec-cmp.html -#usr/share/doc/cups/help/spec-command.html -#usr/share/doc/cups/help/spec-design.html -#usr/share/doc/cups/help/spec-ipp.html -#usr/share/doc/cups/help/spec-pdf.html -#usr/share/doc/cups/help/spec-postscript.html -#usr/share/doc/cups/help/spec-ppd.html -#usr/share/doc/cups/help/spec-raster.html -#usr/share/doc/cups/help/spec-stp.html -#usr/share/doc/cups/help/translation.html -#usr/share/doc/cups/help/whatsnew.html +usr/share/doc/cups/help/accounting.html +usr/share/doc/cups/help/api-array.html +usr/share/doc/cups/help/api-cgi.html +usr/share/doc/cups/help/api-cups.html +usr/share/doc/cups/help/api-driver.html +usr/share/doc/cups/help/api-filedir.html +usr/share/doc/cups/help/api-filter.html +usr/share/doc/cups/help/api-httpipp.html +usr/share/doc/cups/help/api-mime.html +usr/share/doc/cups/help/api-overview.html +usr/share/doc/cups/help/api-ppd.html +usr/share/doc/cups/help/api-ppdc.html +usr/share/doc/cups/help/api-raster.html +usr/share/doc/cups/help/cgi.html +usr/share/doc/cups/help/glossary.html +usr/share/doc/cups/help/kerberos.html +usr/share/doc/cups/help/license.html +usr/share/doc/cups/help/man-backend.html +usr/share/doc/cups/help/man-cancel.html +usr/share/doc/cups/help/man-cups-config.html +usr/share/doc/cups/help/man-cups-lpd.html +usr/share/doc/cups/help/man-cups-snmp.html +usr/share/doc/cups/help/man-cupsaccept.html +usr/share/doc/cups/help/man-cupsaddsmb.html +usr/share/doc/cups/help/man-cupsd.html +usr/share/doc/cups/help/man-cupsenable.html +usr/share/doc/cups/help/man-cupstestdsc.html +usr/share/doc/cups/help/man-cupstestppd.html +usr/share/doc/cups/help/man-filter.html +usr/share/doc/cups/help/man-ipptool.html +usr/share/doc/cups/help/man-ipptoolfile.html +usr/share/doc/cups/help/man-lp.html +usr/share/doc/cups/help/man-lpadmin.html +usr/share/doc/cups/help/man-lpc.html +usr/share/doc/cups/help/man-lpinfo.html +usr/share/doc/cups/help/man-lpmove.html +usr/share/doc/cups/help/man-lpoptions.html +usr/share/doc/cups/help/man-lppasswd.html +usr/share/doc/cups/help/man-lpq.html +usr/share/doc/cups/help/man-lpr.html +usr/share/doc/cups/help/man-lprm.html +usr/share/doc/cups/help/man-lpstat.html +usr/share/doc/cups/help/man-mime.convs.html +usr/share/doc/cups/help/man-mime.types.html +usr/share/doc/cups/help/man-notifier.html +usr/share/doc/cups/help/man-ppdc.html +usr/share/doc/cups/help/man-ppdhtml.html +usr/share/doc/cups/help/man-ppdi.html +usr/share/doc/cups/help/man-ppdmerge.html +usr/share/doc/cups/help/man-ppdpo.html +usr/share/doc/cups/help/network.html +usr/share/doc/cups/help/options.html +usr/share/doc/cups/help/overview.html +usr/share/doc/cups/help/policies.html +usr/share/doc/cups/help/postscript-driver.html +usr/share/doc/cups/help/ppd-compiler.html +usr/share/doc/cups/help/raster-driver.html +usr/share/doc/cups/help/ref-access_log.html +usr/share/doc/cups/help/ref-classes-conf.html +usr/share/doc/cups/help/ref-client-conf.html +usr/share/doc/cups/help/ref-cups-files-conf.html +usr/share/doc/cups/help/ref-cupsd-conf.html +usr/share/doc/cups/help/ref-error_log.html +usr/share/doc/cups/help/ref-mailto-conf.html +usr/share/doc/cups/help/ref-page_log.html +usr/share/doc/cups/help/ref-ppdcfile.html +usr/share/doc/cups/help/ref-printers-conf.html +usr/share/doc/cups/help/ref-snmp-conf.html +usr/share/doc/cups/help/ref-subscriptions-conf.html +usr/share/doc/cups/help/security.html +usr/share/doc/cups/help/sharing.html +usr/share/doc/cups/help/spec-banner.html +usr/share/doc/cups/help/spec-cmp.html +usr/share/doc/cups/help/spec-command.html +usr/share/doc/cups/help/spec-design.html +usr/share/doc/cups/help/spec-ipp.html +usr/share/doc/cups/help/spec-pdf.html +usr/share/doc/cups/help/spec-postscript.html +usr/share/doc/cups/help/spec-ppd.html +usr/share/doc/cups/help/spec-raster.html +usr/share/doc/cups/help/spec-stp.html +usr/share/doc/cups/help/translation.html +usr/share/doc/cups/help/whatsnew.html usr/share/doc/cups/images -#usr/share/doc/cups/images/color-wheel.png -#usr/share/doc/cups/images/cups-block-diagram.png -#usr/share/doc/cups/images/cups-command-chain.png -#usr/share/doc/cups/images/cups-icon.png -#usr/share/doc/cups/images/cups-postscript-chain.png -#usr/share/doc/cups/images/cups-raster-chain.png -#usr/share/doc/cups/images/cups.png -#usr/share/doc/cups/images/left.gif -#usr/share/doc/cups/images/raster-organization.png -#usr/share/doc/cups/images/raster.png -#usr/share/doc/cups/images/right.gif -#usr/share/doc/cups/images/sample-image.png -#usr/share/doc/cups/images/sel.gif -#usr/share/doc/cups/images/smiley.jpg -#usr/share/doc/cups/images/unsel.gif -#usr/share/doc/cups/images/wait.gif +usr/share/doc/cups/images/color-wheel.png +usr/share/doc/cups/images/cups-block-diagram.png +usr/share/doc/cups/images/cups-command-chain.png +usr/share/doc/cups/images/cups-icon.png +usr/share/doc/cups/images/cups-postscript-chain.png +usr/share/doc/cups/images/cups-raster-chain.png +usr/share/doc/cups/images/cups.png +usr/share/doc/cups/images/left.gif +usr/share/doc/cups/images/raster-organization.png +usr/share/doc/cups/images/raster.png +usr/share/doc/cups/images/right.gif +usr/share/doc/cups/images/sample-image.png +usr/share/doc/cups/images/sel.gif +usr/share/doc/cups/images/smiley.jpg +usr/share/doc/cups/images/unsel.gif +usr/share/doc/cups/images/wait.gif usr/share/doc/cups/index.html -#usr/share/doc/cups/it -#usr/share/doc/cups/it/index.html -#usr/share/doc/cups/ja -#usr/share/doc/cups/ja/index.html +usr/share/doc/cups/it +usr/share/doc/cups/it/index.html +usr/share/doc/cups/ja +usr/share/doc/cups/ja/index.html usr/share/doc/cups/robots.txt -#usr/share/doc/cups/ru -#usr/share/doc/cups/ru/index.html -#usr/share/locale/ca/cups_ca.po -#usr/share/locale/cs/cups_cs.po -#usr/share/locale/es/cups_es.po -#usr/share/locale/fr/cups_fr.po -#usr/share/locale/it/cups_it.po -#usr/share/locale/ja/cups_ja.po -#usr/share/locale/ru/cups_ru.po +usr/share/doc/cups/ru +usr/share/doc/cups/ru/index.html +usr/share/locale/ca/cups_ca.po +usr/share/locale/cs/cups_cs.po +usr/share/locale/es/cups_es.po +usr/share/locale/fr/cups_fr.po +usr/share/locale/it/cups_it.po +usr/share/locale/ja/cups_ja.po +usr/share/locale/ru/cups_ru.po #usr/share/man/man1/cancel.1.gz #usr/share/man/man1/cups-config.1.gz #usr/share/man/man1/cupstestdsc.1.gz @@ -926,7 +926,7 @@ usr/share/doc/cups/robots.txt #usr/share/man/man8/lpmove.8.gz #usr/share/man/man8/reject.8.gz var/cache/cups -#var/cache/cups/rss +var/cache/cups/rss #var/ipfire/cups var/ipfire/cups/cups-files.conf var/ipfire/cups/cupsd.conf diff --git a/lfs/configroot b/lfs/configroot index 8250a77..3232d38 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -107,6 +107,7 @@ $(TARGET) : cp $(DIR_SRC)/config/firewall/firewall-policy /usr/sbin/firewall-policy cp $(DIR_SRC)/config/fwhosts/icmp-types $(CONFIG_ROOT)/fwhosts/icmp-types cp $(DIR_SRC)/config/fwhosts/customservices $(CONFIG_ROOT)/fwhosts/customservices + cp $(DIR_SRC)/config/fwhosts/customservices $(CONFIG_ROOT)/fwhosts/customservices.default # Oneliner configfiles echo "ENABLED=off" > $(CONFIG_ROOT)/vpn/settings echo "VPN_DELAYED_START=0" >>$(CONFIG_ROOT)/vpn/settings diff --git a/lfs/cups b/lfs/cups index 08b574b..60f7e21 100644 --- a/lfs/cups +++ b/lfs/cups @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 9 +PAK_VER = 10 DEPS = "ghostscript" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 90b0389a90b58695a05e419e9098b96cac66e003
by git＠ipfire.org 27 Mar '14

27 Mar '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8fcb92530e4ddd8146d0d82e380a161cc85413e4
by git＠ipfire.org 26 Mar '14

26 Mar '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 513c321ebedcf0865863b95ccd453f155f7703ed
by git＠ipfire.org 26 Mar '14

26 Mar '14

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 2.x development tree". The branch, next has been updated via 513c321ebedcf0865863b95ccd453f155f7703ed (commit) from 6a79396ce6dba66f4f8cce26a743be3496a8902c (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 513c321ebedcf0865863b95ccd453f155f7703ed Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 26 08:35:00 2014 +0100 wlanap.cgi: fix missing line from wlan info. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/entropy.cgi | 0 html/cgi-bin/wlanap.cgi | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 html/cgi-bin/entropy.cgi Difference in files: diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi old mode 100755 new mode 100644 diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index bbf2546..50806ac 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -512,7 +512,7 @@ if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){ @status = `wlanconfig $wlanapsettings{'INTERFACE'} list`; } if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ - @status = `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump`; + @status = `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump && echo ""`; } print <<END <br /> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6a79396ce6dba66f4f8cce26a743be3496a8902c
by git＠ipfire.org 25 Mar '14

25 Mar '14

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 2.x development tree". The branch, next has been updated via 6a79396ce6dba66f4f8cce26a743be3496a8902c (commit) from 91eb94ee2f95c8d0e5ca709ea8e1480959581f7c (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 6a79396ce6dba66f4f8cce26a743be3496a8902c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 25 19:11:03 2014 +0100 hostapd: change setting of the regdomain. the regdomain is only updated if it was really changed but after boot the system believe it is "00" World but it is not correctly set at some cards. So we set a region and set it back to "00" before the real region was set. ----------------------------------------------------------------------- Summary of changes: lfs/hostapd | 2 +- src/initscripts/init.d/hostapd | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/hostapd b/lfs/hostapd index 36343de..5560a42 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 28 +PAK_VER = 29 DEPS = "" diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd index c0b11e6..8f59a7f 100644 --- a/src/initscripts/init.d/hostapd +++ b/src/initscripts/init.d/hostapd @@ -75,7 +75,10 @@ case "${1}" in fi fi - # First reset to World (00) and then set new country + # First set to any country then reset to World (00) + # and then set new country because the card is only + # reprogrammed if the region was changed. + /usr/sbin/iw reg set DE /usr/sbin/iw reg set 00 /usr/sbin/iw reg set $COUNTRY hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91eb94ee2f95c8d0e5ca709ea8e1480959581f7c
by git＠ipfire.org 25 Mar '14

25 Mar '14

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 2.x development tree". The branch, next has been updated via 91eb94ee2f95c8d0e5ca709ea8e1480959581f7c (commit) from 57c209d558e0b410d5f42493d328d2c06cef20ac (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 91eb94ee2f95c8d0e5ca709ea8e1480959581f7c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 25 13:15:43 2014 +0100 wlanap: fix typo. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/wlanap.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 16b3fea..bbf2546 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -265,7 +265,7 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`; chomp $wiphy; -@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "passive scanning"" 2>/dev/null`; +@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "passive scanning" 2>/dev/null`; # get available channels my @temp; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57c209d558e0b410d5f42493d328d2c06cef20ac
by git＠ipfire.org 25 Mar '14

25 Mar '14

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 2.x development tree". The branch, next has been updated via 57c209d558e0b410d5f42493d328d2c06cef20ac (commit) via 5c8167f5766250bdc3b57e6242e487fb467f895f (commit) from f763ff3224dec67963bd47ef176085d7dd310fc0 (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 57c209d558e0b410d5f42493d328d2c06cef20ac Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 25 13:03:56 2014 +0100 wlanap.cgi: fix detection of not useable channels. commit 5c8167f5766250bdc3b57e6242e487fb467f895f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 25 12:59:37 2014 +0100 iwlwifi: use noibss flags only on radar detection channels. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/wlanap.cgi | 2 +- lfs/linux | 1 + ...3.10.34-iwlwifi-noibss_only_on_radar_chan.patch | 23 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch Difference in files: diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 5b2490d..16b3fea 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -265,7 +265,7 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`; chomp $wiphy; -@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS)" 2>/dev/null`; +@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "passive scanning"" 2>/dev/null`; # get available channels my @temp; diff --git a/lfs/linux b/lfs/linux index 9f82ab0..1f91c0b 100644 --- a/lfs/linux +++ b/lfs/linux @@ -136,6 +136,7 @@ endif # Wlan Patches cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch # mISDN Patches cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch diff --git a/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch b/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch new file mode 100644 index 0000000..cc76fe6 --- /dev/null +++ b/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch @@ -0,0 +1,23 @@ +diff -Naur linux-3.10.34.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c linux-3.10.34/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c +--- linux-3.10.34.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-03-24 05:42:03.000000000 +0100 ++++ linux-3.10.34/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-03-25 09:08:28.548634788 +0100 +@@ -613,14 +613,16 @@ + /* set no-HT40, will enable as appropriate later */ + channel->flags = IEEE80211_CHAN_NO_HT40; + ++ ++ if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR) { ++ channel->flags |= IEEE80211_CHAN_RADAR; ++ + if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS)) + channel->flags |= IEEE80211_CHAN_NO_IBSS; + + if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE)) + channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN; +- +- if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR) +- channel->flags |= IEEE80211_CHAN_RADAR; ++} + + /* Initialize regulatory-based run-time data */ + channel->max_power = hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f763ff3224dec67963bd47ef176085d7dd310fc0
by git＠ipfire.org 24 Mar '14

24 Mar '14

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 2.x development tree". The branch, next has been updated via f763ff3224dec67963bd47ef176085d7dd310fc0 (commit) from af433268e063cbcb435b4770027906d897d9bb6f (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 f763ff3224dec67963bd47ef176085d7dd310fc0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 24 13:28:29 2014 +0100 kernel: update to 3.10.34. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 687de36..9f82ab0 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.33 +VER = 3.10.34 RPI_PATCHES = linux-3.10.27-grsec-943b563 -GRS_PATCHES = grsecurity-2.9.1-3.10.33-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.34-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 38 +PAK_VER = 39 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 01865f9c129f3c7eee51e25b3781a364 +$(DL_FILE)_MD5 = 30991b495a3d75196d5608072d2e62e6 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 8cf81f48408306d93ccee59b58af2e92 -$(GRS_PATCHES)_MD5 = c99be0018e8bc55fb2e2b8f0ea9783d5 +$(GRS_PATCHES)_MD5 = b490f7f3bf48387ab2eb60212fcf0c11 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. af433268e063cbcb435b4770027906d897d9bb6f
by git＠ipfire.org 23 Mar '14

23 Mar '14

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 2.x development tree". The branch, next has been updated via af433268e063cbcb435b4770027906d897d9bb6f (commit) from 51cf3f8be548e3bb3bff19bab7c27dbb56e6e426 (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 af433268e063cbcb435b4770027906d897d9bb6f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 23 17:39:47 2014 +0100 graphs.pl: fix links position in chrome for android. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 4942c98..487a4dd 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -92,7 +92,7 @@ sub makegraphbox { print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>"; print " - "; print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>"; - print "</center>"; + print "<br></center>"; print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>"; } hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2014