domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: remove all @{lt,gt,ge,le} appearances affecting 5.10 kernel

Browse Source 
We only use 5.15 kernel. So remove all those unnecessary appearances.

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke
2023-05-04 21:40:15 +02:00
committed by Christian Marangi
parent 330ad3e98f
commit d798617d4a
12 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/kernel/linux/modules/block.mk
View File

@@ -521,13 +521,13 @@ define KernelPackage/scsi-core
TITLE:=SCSI device support TITLE:=SCSI device support
KCONFIG:= \ KCONFIG:= \
CONFIG_SCSI \ CONFIG_SCSI \
CONFIG_SCSI_COMMON@ge5.15 \ CONFIG_SCSI_COMMON \
CONFIG_BLK_DEV_SD CONFIG_BLK_DEV_SD
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/scsi/scsi_mod.ko \ $(LINUX_DIR)/drivers/scsi/scsi_mod.ko \
$(LINUX_DIR)/drivers/scsi/scsi_common.ko@ge5.15 \ $(LINUX_DIR)/drivers/scsi/scsi_common.ko \
$(LINUX_DIR)/drivers/scsi/sd_mod.ko $(LINUX_DIR)/drivers/scsi/sd_mod.ko
AUTOLOAD:=$(call AutoLoad,40,scsi_mod scsi_common@ge5.15 sd_mod,1) AUTOLOAD:=$(call AutoLoad,40,scsi_mod scsi_common sd_mod,1)
endef endef
$(eval $(call KernelPackage,scsi-core)) $(eval $(call KernelPackage,scsi-core))

7
package/kernel/linux/modules/crypto.mk
View File

@@ -704,7 +704,6 @@ define KernelPackage/crypto-misc
CONFIG_CRYPTO_KHAZAD \ CONFIG_CRYPTO_KHAZAD \
CONFIG_CRYPTO_SERPENT \ CONFIG_CRYPTO_SERPENT \
CONFIG_CRYPTO_TEA \ CONFIG_CRYPTO_TEA \
CONFIG_CRYPTO_TGR192@lt5.12 \
CONFIG_CRYPTO_TWOFISH \ CONFIG_CRYPTO_TWOFISH \
CONFIG_CRYPTO_TWOFISH_COMMON \ CONFIG_CRYPTO_TWOFISH_COMMON \
CONFIG_CRYPTO_TWOFISH_586 \ CONFIG_CRYPTO_TWOFISH_586 \
@@ -717,7 +716,6 @@ define KernelPackage/crypto-misc
$(LINUX_DIR)/crypto/cast6_generic.ko \ $(LINUX_DIR)/crypto/cast6_generic.ko \
$(LINUX_DIR)/crypto/khazad.ko \ $(LINUX_DIR)/crypto/khazad.ko \
$(LINUX_DIR)/crypto/tea.ko \ $(LINUX_DIR)/crypto/tea.ko \
$(LINUX_DIR)/crypto/tgr192.ko@lt5.12 \
$(LINUX_DIR)/crypto/twofish_common.ko \ $(LINUX_DIR)/crypto/twofish_common.ko \
$(LINUX_DIR)/crypto/wp512.ko \ $(LINUX_DIR)/crypto/wp512.ko \
$(LINUX_DIR)/crypto/twofish_generic.ko \ $(LINUX_DIR)/crypto/twofish_generic.ko \
@@ -725,7 +723,7 @@ define KernelPackage/crypto-misc
$(LINUX_DIR)/crypto/blowfish_generic.ko \ $(LINUX_DIR)/crypto/blowfish_generic.ko \
$(LINUX_DIR)/crypto/serpent_generic.ko $(LINUX_DIR)/crypto/serpent_generic.ko
AUTOLOAD:=$(call AutoLoad,10,anubis camellia_generic cast_common \ AUTOLOAD:=$(call AutoLoad,10,anubis camellia_generic cast_common \
cast5_generic cast6_generic khazad tea tgr192@lt5.12 twofish_common \ cast5_generic cast6_generic khazad tea twofish_common \
wp512 blowfish_common serpent_generic) wp512 blowfish_common serpent_generic)
ifndef CONFIG_TARGET_x86 ifndef CONFIG_TARGET_x86
AUTOLOAD+= $(call AutoLoad,10,twofish_generic blowfish_generic) AUTOLOAD+= $(call AutoLoad,10,twofish_generic blowfish_generic)
@@ -738,10 +736,9 @@ ifndef CONFIG_TARGET_x86_64
FILES+= \ FILES+= \
$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \ $(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \
$(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \ $(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \
$(LINUX_DIR)/arch/x86/crypto/glue_helper.ko@lt5.12 \
$(LINUX_DIR)/crypto/cryptd.ko \ $(LINUX_DIR)/crypto/cryptd.ko \
$(LINUX_DIR)/crypto/crypto_simd.ko $(LINUX_DIR)/crypto/crypto_simd.ko
AUTOLOAD+= $(call AutoLoad,10,cryptd glue_helper@lt5.12 \ AUTOLOAD+= $(call AutoLoad,10,cryptd \
serpent-sse2-i586 twofish-i586 blowfish_generic) serpent-sse2-i586 twofish-i586 blowfish_generic)
endef endef
endif endif

6
package/kernel/linux/modules/fs.mk
View File

@@ -87,13 +87,13 @@ define KernelPackage/fs-cifs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=CIFS support TITLE:=CIFS support
KCONFIG:= \ KCONFIG:= \
CONFIG_SMBFS_COMMON@ge5.15 \ CONFIG_SMBFS_COMMON \
CONFIG_CIFS \ CONFIG_CIFS \
CONFIG_CIFS_DFS_UPCALL=n \ CONFIG_CIFS_DFS_UPCALL=n \
CONFIG_CIFS_UPCALL=n CONFIG_CIFS_UPCALL=n
FILES:= \ FILES:= \
$(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@ge5.15 \ $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko \
$(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@ge5.15 \ $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko \
$(LINUX_DIR)/fs/cifs/cifs.ko $(LINUX_DIR)/fs/cifs/cifs.ko
AUTOLOAD:=$(call AutoLoad,30,cifs) AUTOLOAD:=$(call AutoLoad,30,cifs)
$(call AddDepends/nls) $(call AddDepends/nls)

2
package/kernel/linux/modules/iio.mk
View File

@@ -438,7 +438,7 @@ define KernelPackage/iio-sps30
CONFIG_SPS30_I2C CONFIG_SPS30_I2C
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/iio/chemical/sps30.ko \ $(LINUX_DIR)/drivers/iio/chemical/sps30.ko \
$(LINUX_DIR)/drivers/iio/chemical/sps30_i2c.ko@ge5.14 $(LINUX_DIR)/drivers/iio/chemical/sps30_i2c.ko
AUTOLOAD:=$(call AutoProbe,sps30 sps30_i2c) AUTOLOAD:=$(call AutoProbe,sps30 sps30_i2c)
$(call AddDepends/iio) $(call AddDepends/iio)
endef endef

8
package/kernel/linux/modules/input.mk
View File

@@ -179,10 +179,8 @@ define KernelPackage/input-touchscreen-ads7846
DEPENDS:=+kmod-hwmon-core +kmod-input-core +kmod-spi-bitbang DEPENDS:=+kmod-hwmon-core +kmod-input-core +kmod-spi-bitbang
KCONFIG:= \ KCONFIG:= \
CONFIG_INPUT_TOUCHSCREEN=y \ CONFIG_INPUT_TOUCHSCREEN=y \
CONFIG_TOUCHSCREEN_PROPERTIES=y@lt5.13 \
CONFIG_TOUCHSCREEN_ADS7846 CONFIG_TOUCHSCREEN_ADS7846
FILES:=$(LINUX_DIR)/drivers/input/touchscreen/ads7846.ko \ FILES:=$(LINUX_DIR)/drivers/input/touchscreen/ads7846.ko
$(LINUX_DIR)/drivers/input/touchscreen/of_touchscreen.ko@lt5.13
AUTOLOAD:=$(call AutoProbe,ads7846) AUTOLOAD:=$(call AutoProbe,ads7846)
endef endef
@@ -199,10 +197,8 @@ define KernelPackage/input-touchscreen-edt-ft5x06
DEPENDS:=+kmod-i2c-core +kmod-input-core DEPENDS:=+kmod-i2c-core +kmod-input-core
KCONFIG:= \ KCONFIG:= \
CONFIG_INPUT_TOUCHSCREEN=y \ CONFIG_INPUT_TOUCHSCREEN=y \
CONFIG_TOUCHSCREEN_PROPERTIES=y@lt5.13 \
CONFIG_TOUCHSCREEN_EDT_FT5X06 CONFIG_TOUCHSCREEN_EDT_FT5X06
FILES:=$(LINUX_DIR)/drivers/input/touchscreen/edt-ft5x06.ko \ FILES:=$(LINUX_DIR)/drivers/input/touchscreen/edt-ft5x06.ko
$(LINUX_DIR)/drivers/input/touchscreen/of_touchscreen.ko@lt5.13
AUTOLOAD:=$(call AutoProbe,edt-ft5x06) AUTOLOAD:=$(call AutoProbe,edt-ft5x06)
endef endef

2
package/kernel/linux/modules/netdevices.mk
View File

@@ -1170,7 +1170,7 @@ define KernelPackage/of-mdio
KCONFIG:=CONFIG_OF_MDIO KCONFIG:=CONFIG_OF_MDIO
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/net/mdio/of_mdio.ko \ $(LINUX_DIR)/drivers/net/mdio/of_mdio.ko \
$(LINUX_DIR)/drivers/net/mdio/fwnode_mdio.ko@ge5.15 $(LINUX_DIR)/drivers/net/mdio/fwnode_mdio.ko
AUTOLOAD:=$(call AutoLoad,41,of_mdio) AUTOLOAD:=$(call AutoLoad,41,of_mdio)
endef endef

1
package/kernel/linux/modules/netfilter.mk
View File

@@ -1141,7 +1141,6 @@ define KernelPackage/nft-bridge
FILES:=$(foreach mod,$(NFT_BRIDGE-m),$(LINUX_DIR)/net/$(mod).ko) FILES:=$(foreach mod,$(NFT_BRIDGE-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_BRIDGE-m))) AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_BRIDGE-m)))
KCONFIG:= \ KCONFIG:= \
CONFIG_NF_LOG_BRIDGE=n@lt5.13 \
$(KCONFIG_NFT_BRIDGE) $(KCONFIG_NFT_BRIDGE)
endef endef

5
package/kernel/linux/modules/spi.mk
View File

@@ -15,10 +15,9 @@ define KernelPackage/mmc-spi
CONFIG_SPI=y \ CONFIG_SPI=y \
CONFIG_SPI_MASTER=y CONFIG_SPI_MASTER=y
FILES:=\ FILES:=\
$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/mmc/host/of_mmc_spi.ko@lt5.13) \ $(LINUX_DIR)/drivers/mmc/host/of_mmc_spi.ko \
$(LINUX_DIR)/drivers/mmc/host/of_mmc_spi.ko@ge5.13 \
$(LINUX_DIR)/drivers/mmc/host/mmc_spi.ko $(LINUX_DIR)/drivers/mmc/host/mmc_spi.ko
AUTOLOAD:=$(call AutoProbe,$(if $(CONFIG_OF),of_mmc_spi@lt5.13) of_mmc_spi@ge5.13 mmc_spi) AUTOLOAD:=$(call AutoProbe,of_mmc_spi mmc_spi)
endef endef
define KernelPackage/mmc-spi/description define KernelPackage/mmc-spi/description

5
package/kernel/linux/modules/usb.mk
View File

@@ -1823,9 +1823,8 @@ define KernelPackage/usb-xhci-mtk
KCONFIG:=CONFIG_USB_XHCI_MTK KCONFIG:=CONFIG_USB_XHCI_MTK
HIDDEN:=1 HIDDEN:=1
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/usb/host/xhci-mtk.ko@lt5.13 \ $(LINUX_DIR)/drivers/usb/host/xhci-mtk-hcd.ko
$(LINUX_DIR)/drivers/usb/host/xhci-mtk-hcd.ko@ge5.13 AUTOLOAD:=$(call AutoLoad,54,xhci-mtk-hcd,1)
AUTOLOAD:=$(call AutoLoad,54,xhci-mtk@lt5.13 xhci-mtk-hcd@gt5.13,1)
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef

2
package/kernel/linux/modules/video.mk
View File

@@ -376,7 +376,7 @@ define KernelPackage/drm-imx-ldb
CONFIG_DRM_PANEL_SITRONIX_ST7789V=n CONFIG_DRM_PANEL_SITRONIX_ST7789V=n
FILES:=$(LINUX_DIR)/drivers/gpu/drm/imx/imx-ldb.ko \ FILES:=$(LINUX_DIR)/drivers/gpu/drm/imx/imx-ldb.ko \
$(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \ $(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_dp_aux_bus.ko@gt5.10 $(LINUX_DIR)/drivers/gpu/drm/drm_dp_aux_bus.ko
AUTOLOAD:=$(call AutoLoad,08,imx-ldb) AUTOLOAD:=$(call AutoLoad,08,imx-ldb)
endef endef

2
package/kernel/linux/modules/virt.mk
View File

@@ -104,7 +104,7 @@ define KernelPackage/vfio-pci
CONFIG_VFIO_PCI \ CONFIG_VFIO_PCI \
CONFIG_VFIO_PCI_IGD=y CONFIG_VFIO_PCI_IGD=y
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/vfio/pci/vfio-pci-core.ko@ge5.15 \ $(LINUX_DIR)/drivers/vfio/pci/vfio-pci-core.ko \
$(LINUX_DIR)/drivers/vfio/pci/vfio-pci.ko $(LINUX_DIR)/drivers/vfio/pci/vfio-pci.ko
AUTOLOAD:=$(call AutoProbe,vfio-pci) AUTOLOAD:=$(call AutoProbe,vfio-pci)
endef endef

1
target/linux/bcm27xx/modules/video.mk
View File

@@ -39,7 +39,6 @@ define KernelPackage/drm-vc4
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/gpu/drm/vc4/vc4.ko \ $(LINUX_DIR)/drivers/gpu/drm/vc4/vc4.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_kms_helper.ko \ $(LINUX_DIR)/drivers/gpu/drm/drm_kms_helper.ko \
$(LINUX_DIR)/drivers/media/cec/cec.ko@lt5.10 \
$(LINUX_DIR)/drivers/media/cec/core/cec.ko $(LINUX_DIR)/drivers/media/cec/core/cec.ko
AUTOLOAD:=$(call AutoProbe,vc4) AUTOLOAD:=$(call AutoProbe,vc4)
endef endef