From 9bf77c63d07566141a318b206f7766d445efd8b0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 Mar 2014 16:01:22 +0000 Subject: [PATCH] kernel: Make configuration management more slink and usable. --- kernel/config-arm-generic | 63 ++++ ...v5tel-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 diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 319f296f7..5b3431a9a 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 @@ -72,6 +75,11 @@ CONFIG_LBDAF=y # # CONFIG_PLAT_SPEAR is not set +# +# Versatile Express platform type +# +CONFIG_PLAT_ORION=y + # # Processor Type # @@ -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,12 +445,18 @@ 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 CONFIG_MMC_DW_EXYNOS=m CONFIG_MMC_DW_PCI=m +# +# LED drivers +# +CONFIG_LEDS_REGULATOR=m + # # iptables trigger is under Netfilter config (LED target) # @@ -418,14 +465,22 @@ 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 # @@ -434,6 +489,11 @@ CONFIG_CLKSRC_MMIO=y CONFIG_OF_IOMMU=y # CONFIG_SHMOBILE_IOMMU is not set +# +# Rpmsg drivers +# +CONFIG_MVEBU_DEVBUS=y + # # Analog to digital converters # @@ -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-kirkwood b/kernel/config-armv5tel-default similarity index 83% rename from kernel/config-armv5tel-kirkwood rename to kernel/config-armv5tel-default index b05506fa7..e14fa04b0 100644 --- a/kernel/config-armv5tel-kirkwood +++ b/kernel/config-armv5tel-default @@ -1,15 +1,9 @@ -CONFIG_ARCH_HAS_CPUFREQ=y # # General setup # CONFIG_BROKEN_ON_SMP=y -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_CHIP=y - # # Timers subsystem # @@ -32,7 +26,6 @@ CONFIG_TINY_RCU=y # System Type # # CONFIG_ARCH_MULTIPLATFORM is not set -# CONFIG_ARCH_VERSATILE is not set CONFIG_ARCH_KIRKWOOD=y # @@ -57,7 +50,6 @@ CONFIG_MACH_TS41X=y # CONFIG_ARCH_KIRKWOOD_DT=y CONFIG_MACH_MV88F6281GTW_GE_DT=y -CONFIG_PLAT_ORION=y CONFIG_PLAT_ORION_LEGACY=y # @@ -76,10 +68,7 @@ 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 @@ -88,7 +77,6 @@ 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 @@ -108,8 +96,6 @@ CONFIG_YENTA_TOSHIBA=y # 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 @@ -166,7 +152,6 @@ CONFIG_REGMAP_I2C=m # # Bus devices # -CONFIG_MVEBU_MBUS=y # CONFIG_MTD is not set # @@ -208,7 +193,6 @@ CONFIG_SCSI_IMM=m # CONFIG_VORTEX=m CONFIG_PCMCIA_XIRCOM=m -CONFIG_MV643XX_ETH=m # # MII PHY device drivers @@ -263,41 +247,22 @@ CONFIG_I2C_PARPORT=m # # 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 # @@ -316,31 +281,22 @@ 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 @@ -433,14 +389,12 @@ 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 @@ -449,38 +403,14 @@ CONFIG_LEDS_NETXBIG=m # 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 # @@ -488,11 +418,6 @@ CONFIG_KIRKWOOD_CLK=y # CONFIG_ORION_TIMER=y -# -# Rpmsg drivers -# -CONFIG_MVEBU_DEVBUS=y - # # Temperature sensors # @@ -513,7 +438,6 @@ CONFIG_ORION_IRQCHIP=y # 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 @@ -522,15 +446,8 @@ CONFIG_DEBUG_UART_8250_SHIFT=2 # CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" -# -# Random Number Generation -# -CONFIG_CRYPTO_DEV_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 1ab74929e..73dd9ec88 100644 --- a/kernel/config-armv7hl-default +++ b/kernel/config-armv7hl-default @@ -1,7 +1,15 @@ +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 # @@ -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,20 +367,33 @@ 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 # @@ -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 @@ -653,6 +734,11 @@ CONFIG_GPIO_TWL6040=m # CONFIG_GPIO_WM8994 is not set # CONFIG_GPIO_ADP5520 is not set +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MCP23S08 is not set + # # MODULbus GPIO expanders: # @@ -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,12 +914,16 @@ 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 # @@ -853,6 +940,26 @@ CONFIG_VIDEO_CODA=m 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 # @@ -991,10 +1098,16 @@ CONFIG_SND_SOC_WM8962=m 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 @@ -1199,21 +1316,36 @@ 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 f3df46959..000000000 --- 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 8d6b89de1..e1e6180fd 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 933d8ac5b..4eb1887ed 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 c6b9e21dc..09b67c341 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 1650e8910..72cb8545c 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 @@ -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 01d626264..c12f8b1b7 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 -- 2.39.2