From 384061fde1027194ced5ba85b2f4c9149861accd Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 24 Jan 2015 22:13:22 +0000 Subject: [PATCH] kernel: drop obsolete kernel version checks Signed-off-by: Felix Fietkau SVN-Revision: 44113 --- include/kernel.mk | 4 +--- package/kernel/linux/modules/crypto.mk | 15 ++++----------- package/kernel/linux/modules/fs.mk | 5 ----- package/kernel/linux/modules/i2c.mk | 11 +---------- package/kernel/linux/modules/other.mk | 2 +- package/kernel/linux/modules/sound.mk | 25 +++---------------------- package/kernel/linux/modules/usb.mk | 21 +-------------------- package/kernel/linux/modules/video.mk | 14 -------------- 8 files changed, 11 insertions(+), 86 deletions(-) diff --git a/include/kernel.mk b/include/kernel.mk index eeb0c3d2bd..dd6c867ea0 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -35,9 +35,7 @@ else endif KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) - ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) - LINUX_UAPI_DIR=uapi/ - endif + LINUX_UAPI_DIR=uapi/ LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null)) LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index bcd45061c5..2f1d33f4a4 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -495,13 +495,6 @@ endef $(eval $(call KernelPackage,crypto-sha256)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) -camellia_mod_suffix=_generic -endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) -cast56_mod_suffix=_generic -endif - define KernelPackage/crypto-misc TITLE:=Other CryptoAPI modules DEPENDS:=+kmod-crypto-manager @@ -523,10 +516,10 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_WP512 FILES:= \ $(LINUX_DIR)/crypto/anubis.ko \ - $(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \ - $(if $(call kernel_patchver_ge,3.7),$(LINUX_DIR)/crypto/cast_common.ko) \ - $(LINUX_DIR)/crypto/cast5$(cast56_mod_suffix).ko \ - $(LINUX_DIR)/crypto/cast6$(cast56_mod_suffix).ko \ + $(LINUX_DIR)/crypto/camellia_generic.ko \ + $(LINUX_DIR)/crypto/cast_common.ko \ + $(LINUX_DIR)/crypto/cast5_generic.ko \ + $(LINUX_DIR)/crypto/cast6_generic.ko \ $(LINUX_DIR)/crypto/khazad.ko \ $(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/tea.ko \ diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 8d2731d199..e1ddbaee68 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -298,14 +298,9 @@ define KernelPackage/fs-nfs CONFIG_NFS_FS \ CONFIG_NFS_USE_LEGACY_DNS=n \ CONFIG_NFS_USE_NEW_IDMAPPER=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) FILES:= \ $(LINUX_DIR)/fs/nfs/nfs.ko \ $(LINUX_DIR)/fs/nfs/nfsv3.ko -else - FILES:= \ - $(LINUX_DIR)/fs/nfs/nfs.ko -endif AUTOLOAD:=$(call AutoLoad,40,nfs nfsv3) endef diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk index 7643138064..a2dcf35e53 100644 --- a/package/kernel/linux/modules/i2c.mk +++ b/package/kernel/linux/modules/i2c.mk @@ -206,13 +206,8 @@ endef $(eval $(call KernelPackage,i2c-mux)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) I2C_MUX_GPIO_MODULES:= \ CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/i2c-mux-gpio -else -I2C_MUX_GPIO_MODULES:= \ - CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/gpio-i2cmux -endif define KernelPackage/i2c-mux-gpio $(call i2c_defaults,$(I2C_MUX_GPIO_MODULES),51) @@ -226,12 +221,8 @@ endef $(eval $(call KernelPackage,i2c-mux-gpio)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) -I2C_MUX_PREFIX:=i2c-mux- -endif - I2C_MUX_PCA954x_MODULES:= \ - CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca954x + CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/i2c-mux-pca954x define KernelPackage/i2c-mux-pca954x $(call i2c_defaults,$(I2C_MUX_PCA954x_MODULES),51) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index decc1df675..b2d8eb7efa 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -698,7 +698,7 @@ define KernelPackage/serial-8250 CONFIG_SERIAL_8250_SHARE_IRQ=y \ CONFIG_SERIAL_8250_DETECT_IRQ=n \ CONFIG_SERIAL_8250_RSA=n - FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(call kernel_patchver_ge,3.7),$(if $(call kernel_patchver_le,3.8),_core)).ko + FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250.ko endef define KernelPackage/serial-8250/description diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index be01638174..964524b0af 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -17,7 +17,8 @@ SOUNDCORE_LOAD ?= \ snd-timer \ snd-pcm \ snd-mixer-oss \ - snd-pcm-oss + snd-pcm-oss \ + snd-compress SOUNDCORE_FILES ?= \ $(LINUX_DIR)/sound/soundcore.ko \ @@ -28,15 +29,8 @@ SOUNDCORE_FILES ?= \ $(LINUX_DIR)/sound/core/snd-timer.ko \ $(LINUX_DIR)/sound/core/snd-pcm.ko \ $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \ - $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko - -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3.0)),1) -SOUNDCORE_LOAD += \ - snd-compress - -SOUNDCORE_FILES += \ + $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko \ $(LINUX_DIR)/sound/core/snd-compress.ko -endif ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.12.0)),1) SOUNDCORE_LOAD += \ @@ -196,18 +190,6 @@ $(eval $(call KernelPackage,sound-soc-ac97)) define KernelPackage/sound-soc-imx TITLE:=IMX SoC support -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1) - KCONFIG:=\ - CONFIG_SND_IMX_SOC \ - CONFIG_SND_SOC_IMX_AUDMUX \ - CONFIG_SND_SOC_FSL_SSI \ - CONFIG_SND_SOC_IMX_PCM - FILES:= \ - $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-audmux.ko \ - $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \ - $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-pcm.ko - AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm) -else KCONFIG:=\ CONFIG_SND_IMX_SOC \ CONFIG_SND_SOC_IMX_AUDMUX \ @@ -218,7 +200,6 @@ else $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \ $(LINUX_DIR)/sound/soc/fsl/imx-pcm-dma.ko AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm) -endif DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core $(call AddDepends/sound) endef diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index e147c49372..9e5a1ebe58 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -400,7 +400,6 @@ define KernelPackage/usb2 CONFIG_USB_OCTEON_EHCI=y \ CONFIG_USB_EHCI_HCD_ORION=y \ CONFIG_USB_EHCI_HCD_PLATFORM=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.8.0)),1) FILES:= \ $(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \ $(LINUX_DIR)/drivers/usb/host/ehci-platform.ko @@ -408,10 +407,6 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.8.0)),1) FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-orion.ko endif AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion,1) -else - FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko - AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1) -endif $(call AddDepends/usb) endef @@ -440,21 +435,15 @@ $(eval $(call KernelPackage,usb2-pci)) define KernelPackage/usb-dwc2 TITLE:=DWC2 USB controller driver - DEPENDS:=@!LINUX_3_8 + DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 KCONFIG:= \ CONFIG_USB_DWC2 \ CONFIG_USB_DWC2_DEBUG=n \ CONFIG_USB_DWC2_VERBOSE=n \ CONFIG_USB_DWC2_TRACK_MISSED_SOFS=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1) FILES:= \ $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko \ $(LINUX_DIR)/drivers/usb/dwc2/dwc2_platform.ko -else - FILES:= \ - $(LINUX_DIR)/drivers/staging/dwc2/dwc2.ko \ - $(LINUX_DIR)/drivers/staging/dwc2/dwc2_platform.ko -endif AUTOLOAD:=$(call AutoLoad,54,dwc2 dwc2_platform,1) $(call AddDepends/usb) endef @@ -1409,19 +1398,11 @@ define KernelPackage/usb-chipidea-imx CONFIG_USB_CHIPIDEA_HOST=y \ CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1) - FILES:=\ - $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ - $(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko) \ - $(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q).ko) - AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF_DEVICE),ci13xxx_imx usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q)),1) -else FILES:=\ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko) \ $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko) AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1) -endif $(call AddDepends/usb) endef diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 0681b0e767..77ba29a000 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -8,14 +8,8 @@ VIDEO_MENU:=Video Support -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) V4L2_DIR=v4l2-core V4L2_USB_DIR=usb -else -V4L2_DIR=video -V4L2_USB_DIR=video -endif - define KernelPackage/fb SUBMENU:=$(VIDEO_MENU) @@ -99,18 +93,10 @@ define KernelPackage/video-core CONFIG_V4L_PCI_DRIVERS=y \ CONFIG_V4L_PLATFORM_DRIVERS=y \ CONFIG_V4L_ISA_PARPORT_DRIVERS=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) FILES:= \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-common.ko \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common) -else - FILES:= \ - $(if $(CONFIG_COMPAT),$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-compat-ioctl32.ko) \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-common.ko \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko - AUTOLOAD:=$(call AutoLoad,60, $(if $(CONFIG_COMPAT),v4l2-compat-ioctl32) videodev v4l2-common) -endif endef define KernelPackage/video-core/description -- 2.30.2