Skip to content

Commit

Permalink
kernel: clean-up after kernel 5.4 removal
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@tmn505 @chunkeey
tmn505 authored and chunkeey committed Jun 24, 2022
1 parent a74a853 commit 9bad345
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 30 deletions.
2 changes: 1 addition & 1 deletion package/kernel/linux/modules/crypto.mk
View file
Expand Up @@ -42,7 +42,7 @@ define KernelPackage/crypto-aead
CONFIG_CRYPTO_AEAD2
FILES:= \
$(LINUX_DIR)/crypto/aead.ko \
$(LINUX_DIR)/crypto/geniv.ko@ge5.10
$(LINUX_DIR)/crypto/geniv.ko
AUTOLOAD:=$(call AutoLoad,09,aead,1)
$(call AddDepends/crypto, +kmod-crypto-null)
endef
Expand Down
10 changes: 4 additions & 6 deletions package/kernel/linux/modules/fs.mk
View file
Expand Up @@ -98,13 +98,13 @@ define KernelPackage/fs-cifs
AUTOLOAD:=$(call AutoLoad,30,cifs)
$(call AddDepends/nls)
DEPENDS+= \
+(LINUX_5_4||LINUX_5_10):kmod-crypto-md4\
+LINUX_5_10:kmod-crypto-md4\
+kmod-crypto-md5 \
+kmod-crypto-sha256 \
+kmod-crypto-sha512 \
+kmod-crypto-cmac \
+kmod-crypto-hmac \
+(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \
+LINUX_5_10:kmod-crypto-arc4 \
+kmod-crypto-aead \
+kmod-crypto-ccm \
+kmod-crypto-ecb \
Expand Down Expand Up @@ -176,9 +176,7 @@ define KernelPackage/fs-exfat
KCONFIG:= \
CONFIG_EXFAT_FS \
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
FILES:= \
$(LINUX_DIR)/drivers/staging/exfat/exfat.ko@lt5.7 \
$(LINUX_DIR)/fs/exfat/exfat.ko@ge5.7
FILES:= $(LINUX_DIR)/fs/exfat/exfat.ko
AUTOLOAD:=$(call AutoLoad,30,exfat,1)
DEPENDS:=+kmod-nls-base
endef
Expand Down Expand Up @@ -413,7 +411,7 @@ define KernelPackage/fs-nfs-common
$(LINUX_DIR)/fs/lockd/lockd.ko \
$(LINUX_DIR)/net/sunrpc/sunrpc.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)
endef

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/linux/modules/i2c.mk
View file
Expand Up @@ -90,7 +90,7 @@ I2C_DWCORE_MODULES:= \
define KernelPackage/i2c-designware-core
$(call i2c_defaults,$(I2C_DWCORE_MODULES),58)
TITLE:=Synopsys DesignWare I2C core
DEPENDS:=+kmod-i2c-core +!LINUX_5_4:kmod-regmap-core
DEPENDS:=+kmod-i2c-core +kmod-regmap-core
HIDDEN:=y
endef

Expand Down
18 changes: 7 additions & 11 deletions package/kernel/linux/modules/netdevices.mk
View file
Expand Up @@ -141,7 +141,7 @@ $(eval $(call KernelPackage,mii))
define KernelPackage/mdio-devres
SUBMENU:=$(NETWORK_DEVICES_MENU)
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
HIDDEN:=1
FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko
Expand All @@ -163,10 +163,8 @@ define KernelPackage/mdio-gpio
CONFIG_MDIO_BITBANG \
CONFIG_MDIO_GPIO
FILES:= \
$(LINUX_DIR)/drivers/net/phy/mdio-gpio.ko@lt5.10 \
$(LINUX_DIR)/drivers/net/phy/mdio-bitbang.ko@lt5.10 \
$(LINUX_DIR)/drivers/net/mdio/mdio-gpio.ko@ge5.10 \
$(LINUX_DIR)/drivers/net/mdio/mdio-bitbang.ko@ge5.10
$(LINUX_DIR)/drivers/net/mdio/mdio-gpio.ko \
$(LINUX_DIR)/drivers/net/mdio/mdio-bitbang.ko
AUTOLOAD:=$(call AutoProbe,mdio-gpio)
endef

Expand Down Expand Up @@ -593,7 +591,7 @@ $(eval $(call KernelPackage,8139cp))
define KernelPackage/r8169
SUBMENU:=$(NETWORK_DEVICES_MENU)
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:= \
CONFIG_R8169 \
CONFIG_R8169_NAPI=y \
Expand Down Expand Up @@ -719,7 +717,7 @@ $(eval $(call KernelPackage,igbvf))
define KernelPackage/ixgbe
SUBMENU:=$(NETWORK_DEVICES_MENU)
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 \
CONFIG_IXGBE_VXLAN=n \
CONFIG_IXGBE_HWMON=y \
Expand Down Expand Up @@ -1072,8 +1070,7 @@ define KernelPackage/of-mdio
DEPENDS:=+kmod-libphy +kmod-fixed-phy @!TARGET_x86
KCONFIG:=CONFIG_OF_MDIO
FILES:= \
$(LINUX_DIR)/drivers/of/of_mdio.ko@lt5.10 \
$(LINUX_DIR)/drivers/net/mdio/of_mdio.ko@ge5.10 \
$(LINUX_DIR)/drivers/net/mdio/of_mdio.ko \
$(LINUX_DIR)/drivers/net/mdio/fwnode_mdio.ko@ge5.15
AUTOLOAD:=$(call AutoLoad,41,of_mdio)
endef
Expand Down Expand Up @@ -1285,8 +1282,7 @@ define KernelPackage/sfp
CONFIG_MDIO_I2C
FILES:= \
$(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@ge5.10
$(LINUX_DIR)/drivers/net/mdio/mdio-i2c.ko
AUTOLOAD:=$(call AutoProbe,mdio-i2c sfp)
endef

Expand Down
4 changes: 1 addition & 3 deletions package/kernel/linux/modules/netfilter.mk
View file
Expand Up @@ -176,9 +176,7 @@ define KernelPackage/nf-flow
CONFIG_NF_FLOW_TABLE \
CONFIG_NF_FLOW_TABLE_HW
DEPENDS:=+kmod-nf-conntrack
FILES:= \
$(LINUX_DIR)/net/netfilter/nf_flow_table.ko \
$(if $(CONFIG_LINUX_5_4),$(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko)
FILES:= $(LINUX_DIR)/net/netfilter/nf_flow_table.ko
AUTOLOAD:=$(call AutoProbe,nf_flow_table nf_flow_table_hw)
endef

Expand Down
4 changes: 1 addition & 3 deletions package/kernel/linux/modules/other.mk
View file
Expand Up @@ -1190,9 +1190,7 @@ define KernelPackage/keys-trusted
TITLE:=TPM trusted keys on kernel keyring
DEPENDS:=@KERNEL_KEYS +kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha1 +kmod-tpm
KCONFIG:=CONFIG_TRUSTED_KEYS
FILES:= \
$(LINUX_DIR)/security/keys/trusted.ko@lt5.10 \
$(LINUX_DIR)/security/keys/trusted-keys/trusted.ko@ge5.10
FILES:= $(LINUX_DIR)/security/keys/trusted-keys/trusted.ko
AUTOLOAD:=$(call AutoLoad,01,trusted-keys,1)
endef

Expand Down
3 changes: 1 addition & 2 deletions package/kernel/linux/modules/sound.mk
View file
Expand Up @@ -523,8 +523,7 @@ define KernelPackage/sound-hda-intel
CONFIG_SND_HDA_INTEL
FILES:= \
$(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@ge5.5
$(LINUX_DIR)/sound/hda/snd-intel-dspcfg.ko
AUTOLOAD:=$(call AutoProbe,snd-hda-intel)
$(call AddDepends/sound,kmod-sound-hda-core)
endef
Expand Down
6 changes: 3 additions & 3 deletions package/kernel/linux/modules/usb.mk
View file
Expand Up @@ -1250,7 +1250,7 @@ $(eval $(call KernelPackage,usb-net-mcs7830))

define KernelPackage/usb-net-smsc75xx
TITLE:=SMSC LAN75XX based USB 2.0 Gigabit ethernet devices
DEPENDS:=+!LINUX_5_4:kmod-libphy
DEPENDS:=+kmod-libphy
KCONFIG:=CONFIG_USB_NET_SMSC75XX
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc75xx.ko
AUTOLOAD:=$(call AutoProbe,smsc75xx)
Expand All @@ -1266,7 +1266,7 @@ $(eval $(call KernelPackage,usb-net-smsc75xx))

define KernelPackage/usb-net-smsc95xx
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
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko
AUTOLOAD:=$(call AutoProbe,smsc95xx)
Expand Down Expand Up @@ -1439,7 +1439,7 @@ define KernelPackage/usb-net-cdc-ncm
KCONFIG:=CONFIG_USB_NET_CDC_NCM
FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ncm.ko
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

define KernelPackage/usb-net-cdc-ncm/description
Expand Down

0 comments on commit 9bad345

Please sign in to comment.