ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 15:56:49 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

kernel: clean-up after kernel 5.4 removal

Browse Source 
These narrowments are no longer useful, since there's no lower version
than 5.10 supported in tree.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
This commit is contained in:
Tomasz Maciej Nowak 2022-06-20 14:48:19 +02:00 committed by Christian Lamparter
parent a74a853d0d
commit 9bad3451b6
8 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ define KernelPackage/crypto-aead
CONFIG_CRYPTO_AEAD2 CONFIG_CRYPTO_AEAD2
FILES:= \ FILES:= \
$(LINUX_DIR)/crypto/aead.ko \ $(LINUX_DIR)/crypto/aead.ko \
$(LINUX_DIR)/crypto/geniv.ko@ge5.10 $(LINUX_DIR)/crypto/geniv.ko
AUTOLOAD:=$(call AutoLoad,09,aead,1) AUTOLOAD:=$(call AutoLoad,09,aead,1)
$(call AddDepends/crypto, +kmod-crypto-null) $(call AddDepends/crypto, +kmod-crypto-null)
endef endef

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

@ -98,13 +98,13 @@ define KernelPackage/fs-cifs
AUTOLOAD:=$(call AutoLoad,30,cifs) AUTOLOAD:=$(call AutoLoad,30,cifs)
$(call AddDepends/nls) $(call AddDepends/nls)
DEPENDS+= \ DEPENDS+= \
+(LINUX_5_4||LINUX_5_10):kmod-crypto-md4\ +LINUX_5_10:kmod-crypto-md4\
+kmod-crypto-md5 \ +kmod-crypto-md5 \
+kmod-crypto-sha256 \ +kmod-crypto-sha256 \
+kmod-crypto-sha512 \ +kmod-crypto-sha512 \
+kmod-crypto-cmac \ +kmod-crypto-cmac \
+kmod-crypto-hmac \ +kmod-crypto-hmac \
+(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \ +LINUX_5_10:kmod-crypto-arc4 \
+kmod-crypto-aead \ +kmod-crypto-aead \
+kmod-crypto-ccm \ +kmod-crypto-ccm \
+kmod-crypto-ecb \ +kmod-crypto-ecb \
@ -176,9 +176,7 @@ define KernelPackage/fs-exfat
KCONFIG:= \ KCONFIG:= \
CONFIG_EXFAT_FS \ CONFIG_EXFAT_FS \
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
FILES:= \ FILES:= $(LINUX_DIR)/fs/exfat/exfat.ko
$(LINUX_DIR)/drivers/staging/exfat/exfat.ko@lt5.7 \
$(LINUX_DIR)/fs/exfat/exfat.ko@ge5.7
AUTOLOAD:=$(call AutoLoad,30,exfat,1) AUTOLOAD:=$(call AutoLoad,30,exfat,1)
DEPENDS:=+kmod-nls-base DEPENDS:=+kmod-nls-base
endef endef
@ -413,7 +411,7 @@ define KernelPackage/fs-nfs-common
$(LINUX_DIR)/fs/lockd/lockd.ko \ $(LINUX_DIR)/fs/lockd/lockd.ko \
$(LINUX_DIR)/net/sunrpc/sunrpc.ko \ $(LINUX_DIR)/net/sunrpc/sunrpc.ko \
$(LINUX_DIR)/fs/nfs_common/grace.ko \ $(LINUX_DIR)/fs/nfs_common/grace.ko \
$(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko@ge5.10 $(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko
AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd) AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
endef endef

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

@ -90,7 +90,7 @@ I2C_DWCORE_MODULES:= \
define KernelPackage/i2c-designware-core define KernelPackage/i2c-designware-core
$(call i2c_defaults,$(I2C_DWCORE_MODULES),58) $(call i2c_defaults,$(I2C_DWCORE_MODULES),58)
TITLE:=Synopsys DesignWare I2C core TITLE:=Synopsys DesignWare I2C core
DEPENDS:=+kmod-i2c-core +!LINUX_5_4:kmod-regmap-core DEPENDS:=+kmod-i2c-core +kmod-regmap-core
HIDDEN:=y HIDDEN:=y
endef endef

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

@ -141,7 +141,7 @@ $(eval $(call KernelPackage,mii))
define KernelPackage/mdio-devres define KernelPackage/mdio-devres
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Supports MDIO device registration TITLE:=Supports MDIO device registration
DEPENDS:=@(LINUX_5_10||LINUX_5_15) +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_tegra):kmod-of-mdio DEPENDS:=+kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_tegra):kmod-of-mdio
KCONFIG:=CONFIG_MDIO_DEVRES KCONFIG:=CONFIG_MDIO_DEVRES
HIDDEN:=1 HIDDEN:=1
FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko
@ -163,10 +163,8 @@ define KernelPackage/mdio-gpio
CONFIG_MDIO_BITBANG \ CONFIG_MDIO_BITBANG \
CONFIG_MDIO_GPIO CONFIG_MDIO_GPIO
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/net/phy/mdio-gpio.ko@lt5.10 \ $(LINUX_DIR)/drivers/net/mdio/mdio-gpio.ko \
$(LINUX_DIR)/drivers/net/phy/mdio-bitbang.ko@lt5.10 \ $(LINUX_DIR)/drivers/net/mdio/mdio-bitbang.ko
$(LINUX_DIR)/drivers/net/mdio/mdio-gpio.ko@ge5.10 \
$(LINUX_DIR)/drivers/net/mdio/mdio-bitbang.ko@ge5.10
AUTOLOAD:=$(call AutoProbe,mdio-gpio) AUTOLOAD:=$(call AutoProbe,mdio-gpio)
endef endef
@ -593,7 +591,7 @@ $(eval $(call KernelPackage,8139cp))
define KernelPackage/r8169 define KernelPackage/r8169
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +(LINUX_5_10||LINUX_5_15):kmod-mdio-devres DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +kmod-mdio-devres
KCONFIG:= \ KCONFIG:= \
CONFIG_R8169 \ CONFIG_R8169 \
CONFIG_R8169_NAPI=y \ CONFIG_R8169_NAPI=y \
@ -719,7 +717,7 @@ $(eval $(call KernelPackage,igbvf))
define KernelPackage/ixgbe define KernelPackage/ixgbe
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Intel(R) 82598/82599 PCI-Express 10 Gigabit Ethernet support TITLE:=Intel(R) 82598/82599 PCI-Express 10 Gigabit Ethernet support
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +(LINUX_5_10||LINUX_5_15):kmod-mdio-devres DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +kmod-mdio-devres
KCONFIG:=CONFIG_IXGBE \ KCONFIG:=CONFIG_IXGBE \
CONFIG_IXGBE_VXLAN=n \ CONFIG_IXGBE_VXLAN=n \
CONFIG_IXGBE_HWMON=y \ CONFIG_IXGBE_HWMON=y \
@ -1072,8 +1070,7 @@ define KernelPackage/of-mdio
DEPENDS:=+kmod-libphy +kmod-fixed-phy @!TARGET_x86 DEPENDS:=+kmod-libphy +kmod-fixed-phy @!TARGET_x86
KCONFIG:=CONFIG_OF_MDIO KCONFIG:=CONFIG_OF_MDIO
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/of/of_mdio.ko@lt5.10 \ $(LINUX_DIR)/drivers/net/mdio/of_mdio.ko \
$(LINUX_DIR)/drivers/net/mdio/of_mdio.ko@ge5.10 \
$(LINUX_DIR)/drivers/net/mdio/fwnode_mdio.ko@ge5.15 $(LINUX_DIR)/drivers/net/mdio/fwnode_mdio.ko@ge5.15
AUTOLOAD:=$(call AutoLoad,41,of_mdio) AUTOLOAD:=$(call AutoLoad,41,of_mdio)
endef endef
@ -1285,8 +1282,7 @@ define KernelPackage/sfp
CONFIG_MDIO_I2C CONFIG_MDIO_I2C
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/net/phy/sfp.ko \ $(LINUX_DIR)/drivers/net/phy/sfp.ko \
$(LINUX_DIR)/drivers/net/phy/mdio-i2c.ko@lt5.10 \ $(LINUX_DIR)/drivers/net/mdio/mdio-i2c.ko
$(LINUX_DIR)/drivers/net/mdio/mdio-i2c.ko@ge5.10
AUTOLOAD:=$(call AutoProbe,mdio-i2c sfp) AUTOLOAD:=$(call AutoProbe,mdio-i2c sfp)
endef endef

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

@ -176,9 +176,7 @@ define KernelPackage/nf-flow
CONFIG_NF_FLOW_TABLE \ CONFIG_NF_FLOW_TABLE \
CONFIG_NF_FLOW_TABLE_HW CONFIG_NF_FLOW_TABLE_HW
DEPENDS:=+kmod-nf-conntrack DEPENDS:=+kmod-nf-conntrack
FILES:= \ FILES:= $(LINUX_DIR)/net/netfilter/nf_flow_table.ko
$(LINUX_DIR)/net/netfilter/nf_flow_table.ko \
$(if $(CONFIG_LINUX_5_4),$(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko)
AUTOLOAD:=$(call AutoProbe,nf_flow_table nf_flow_table_hw) AUTOLOAD:=$(call AutoProbe,nf_flow_table nf_flow_table_hw)
endef endef

4
package/kernel/linux/modules/other.mk
View File

@ -1190,9 +1190,7 @@ define KernelPackage/keys-trusted
TITLE:=TPM trusted keys on kernel keyring TITLE:=TPM trusted keys on kernel keyring
DEPENDS:=@KERNEL_KEYS +kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha1 +kmod-tpm DEPENDS:=@KERNEL_KEYS +kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha1 +kmod-tpm
KCONFIG:=CONFIG_TRUSTED_KEYS KCONFIG:=CONFIG_TRUSTED_KEYS
FILES:= \ FILES:= $(LINUX_DIR)/security/keys/trusted-keys/trusted.ko
$(LINUX_DIR)/security/keys/trusted.ko@lt5.10 \
$(LINUX_DIR)/security/keys/trusted-keys/trusted.ko@ge5.10
AUTOLOAD:=$(call AutoLoad,01,trusted-keys,1) AUTOLOAD:=$(call AutoLoad,01,trusted-keys,1)
endef endef

3
package/kernel/linux/modules/sound.mk
View File

@ -523,8 +523,7 @@ define KernelPackage/sound-hda-intel
CONFIG_SND_HDA_INTEL CONFIG_SND_HDA_INTEL
FILES:= \ FILES:= \
$(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \ $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \
$(LINUX_DIR)/sound/hda/snd-intel-nhlt.ko@lt5.5 \ $(LINUX_DIR)/sound/hda/snd-intel-dspcfg.ko
$(LINUX_DIR)/sound/hda/snd-intel-dspcfg.ko@ge5.5
AUTOLOAD:=$(call AutoProbe,snd-hda-intel) AUTOLOAD:=$(call AutoProbe,snd-hda-intel)
$(call AddDepends/sound,kmod-sound-hda-core) $(call AddDepends/sound,kmod-sound-hda-core)
endef endef

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

@ -1250,7 +1250,7 @@ $(eval $(call KernelPackage,usb-net-mcs7830))
define KernelPackage/usb-net-smsc75xx define KernelPackage/usb-net-smsc75xx
TITLE:=SMSC LAN75XX based USB 2.0 Gigabit ethernet devices TITLE:=SMSC LAN75XX based USB 2.0 Gigabit ethernet devices
DEPENDS:=+!LINUX_5_4:kmod-libphy DEPENDS:=+kmod-libphy
KCONFIG:=CONFIG_USB_NET_SMSC75XX KCONFIG:=CONFIG_USB_NET_SMSC75XX
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc75xx.ko FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc75xx.ko
AUTOLOAD:=$(call AutoProbe,smsc75xx) AUTOLOAD:=$(call AutoProbe,smsc75xx)
@ -1266,7 +1266,7 @@ $(eval $(call KernelPackage,usb-net-smsc75xx))
define KernelPackage/usb-net-smsc95xx define KernelPackage/usb-net-smsc95xx
TITLE:=SMSC LAN95XX based USB 2.0 10/100 ethernet devices TITLE:=SMSC LAN95XX based USB 2.0 10/100 ethernet devices
DEPENDS:=+(LINUX_5_10||LINUX_5_15):kmod-libphy DEPENDS:=+kmod-libphy
KCONFIG:=CONFIG_USB_NET_SMSC95XX KCONFIG:=CONFIG_USB_NET_SMSC95XX
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko
AUTOLOAD:=$(call AutoProbe,smsc95xx) AUTOLOAD:=$(call AutoProbe,smsc95xx)
@ -1439,7 +1439,7 @@ define KernelPackage/usb-net-cdc-ncm
KCONFIG:=CONFIG_USB_NET_CDC_NCM KCONFIG:=CONFIG_USB_NET_CDC_NCM
FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ncm.ko FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ncm.ko
AUTOLOAD:=$(call AutoProbe,cdc_ncm) AUTOLOAD:=$(call AutoProbe,cdc_ncm)
$(call AddDepends/usb-net,+!LINUX_5_4:kmod-usb-net-cdc-ether) $(call AddDepends/usb-net,+kmod-usb-net-cdc-ether)
endef endef
define KernelPackage/usb-net-cdc-ncm/description define KernelPackage/usb-net-cdc-ncm/description