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

kernel: modules: adapt for kernel 6.1

Browse Source 
Adapt kernel modules to support kernel 6.1.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2022-10-20 03:13:50 +02:00
parent 47e43c86e4
commit a511887644
7 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ define KernelPackage/hwmon-adt7410
$(LINUX_DIR)/drivers/hwmon/adt7x10.ko \ $(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
$(LINUX_DIR)/drivers/hwmon/adt7410.ko $(LINUX_DIR)/drivers/hwmon/adt7410.ko
AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410) AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410)
$(call AddDepends/hwmon,+kmod-i2c-core) $(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_1:kmod-regmap-core)
endef endef
define KernelPackage/hwmon-adt7410/description define KernelPackage/hwmon-adt7410/description

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

@@ -84,6 +84,20 @@ endef
$(eval $(call KernelPackage,i2c-algo-pcf)) $(eval $(call KernelPackage,i2c-algo-pcf))
I2C_CCGS_UCSI_MODULES:= \
CONFIG_I2C_CCGX_UCSI:drivers/i2c/busses/i2c-ccgx-ucsi
define KernelPackage/i2c-ccgs-ucsi
$(call i2c_defaults,$(I2C_CCGS_UCSI_MODULES),58)
TITLE:=Cypress CCGx Type-C controller
DEPENDS:=+kmod-i2c-core +kmod-regmap-core
HIDDEN:=y
endef
$(eval $(call KernelPackage,i2c-ccgs-ucsi))
I2C_DWCORE_MODULES:= \ I2C_DWCORE_MODULES:= \
CONFIG_I2C_DESIGNWARE_CORE:drivers/i2c/busses/i2c-designware-core CONFIG_I2C_DESIGNWARE_CORE:drivers/i2c/busses/i2c-designware-core
@@ -103,7 +117,7 @@ I2C_DWPCI_MODULES:= \
define KernelPackage/i2c-designware-pci define KernelPackage/i2c-designware-pci
$(call i2c_defaults,$(I2C_DWPCI_MODULES),59) $(call i2c_defaults,$(I2C_DWPCI_MODULES),59)
TITLE:=Synopsys DesignWare PCI TITLE:=Synopsys DesignWare PCI
DEPENDS:=@PCI_SUPPORT +kmod-i2c-designware-core DEPENDS:=@PCI_SUPPORT +kmod-i2c-designware-core +kmod-i2c-ccgs-ucsi
endef endef
define KernelPackage/i2c-designware-pci/description define KernelPackage/i2c-designware-pci/description

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

@@ -134,6 +134,7 @@ define KernelPackage/lib-zstd
FILES:= \ FILES:= \
$(LINUX_DIR)/crypto/zstd.ko \ $(LINUX_DIR)/crypto/zstd.ko \
$(LINUX_DIR)/lib/xxhash.ko \ $(LINUX_DIR)/lib/xxhash.ko \
$(LINUX_DIR)/lib/zstd/zstd_common.ko@ge6.1 \
$(LINUX_DIR)/lib/zstd/zstd_compress.ko \ $(LINUX_DIR)/lib/zstd/zstd_compress.ko \
$(LINUX_DIR)/lib/zstd/zstd_decompress.ko $(LINUX_DIR)/lib/zstd/zstd_decompress.ko
AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress) AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress)

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

@@ -1165,15 +1165,15 @@ define KernelPackage/nft-offload
DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat
KCONFIG:= \ KCONFIG:= \
CONFIG_NF_FLOW_TABLE_INET \ CONFIG_NF_FLOW_TABLE_INET \
CONFIG_NF_FLOW_TABLE_IPV4 \ CONFIG_NF_FLOW_TABLE_IPV4@lt5.17 \
CONFIG_NF_FLOW_TABLE_IPV6 \ CONFIG_NF_FLOW_TABLE_IPV6@lt5.17 \
CONFIG_NFT_FLOW_OFFLOAD CONFIG_NFT_FLOW_OFFLOAD
FILES:= \ FILES:= \
$(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \ $(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \
$(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko \ $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko@lt5.17 \
$(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko \ $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko@lt5.17 \
$(LINUX_DIR)/net/netfilter/nft_flow_offload.ko $(LINUX_DIR)/net/netfilter/nft_flow_offload.ko
AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nf_flow_table_ipv4 nf_flow_table_ipv6 nft_flow_offload) AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nf_flow_table_ipv4@lt5.17 nf_flow_table_ipv6@lt5.17 nft_flow_offload)
endef endef
$(eval $(call KernelPackage,nft-offload)) $(eval $(call KernelPackage,nft-offload))

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

@@ -92,7 +92,9 @@ define KernelPackage/vxlan
+kmod-udptunnel4 \ +kmod-udptunnel4 \
+IPV6:kmod-udptunnel6 +IPV6:kmod-udptunnel6
KCONFIG:=CONFIG_VXLAN KCONFIG:=CONFIG_VXLAN
FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko FILES:= \
$(LINUX_DIR)/drivers/net/vxlan.ko@lt5.18 \
$(LINUX_DIR)/drivers/net/vxlan/vxlan.ko@ge5.18
AUTOLOAD:=$(call AutoLoad,13,vxlan) AUTOLOAD:=$(call AutoLoad,13,vxlan)
endef endef

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

@@ -57,7 +57,8 @@ define KernelPackage/bluetooth
$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
$(LINUX_DIR)/drivers/bluetooth/btusb.ko \ $(LINUX_DIR)/drivers/bluetooth/btusb.ko \
$(LINUX_DIR)/drivers/bluetooth/btintel.ko \ $(LINUX_DIR)/drivers/bluetooth/btintel.ko \
$(LINUX_DIR)/drivers/bluetooth/btrtl.ko $(LINUX_DIR)/drivers/bluetooth/btrtl.ko \
$(LINUX_DIR)/drivers/bluetooth/btmtk.ko@ge5.17
AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb) AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
endef endef

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

@@ -1155,7 +1155,9 @@ $(eval $(call KernelPackage,usb-net-aqc111))
define KernelPackage/usb-net-asix define KernelPackage/usb-net-asix
TITLE:=Kernel module for USB-to-Ethernet Asix convertors TITLE:=Kernel module for USB-to-Ethernet Asix convertors
DEPENDS:=+kmod-libphy +kmod-net-selftests +kmod-mdio-devres +kmod-phy-ax88796b DEPENDS:= \
+kmod-libphy +kmod-net-selftests +kmod-mdio-devres +kmod-phy-ax88796b \
+LINUX_6_1:kmod-phylink
KCONFIG:=CONFIG_USB_NET_AX8817X KCONFIG:=CONFIG_USB_NET_AX8817X
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
AUTOLOAD:=$(call AutoProbe,asix) AUTOLOAD:=$(call AutoProbe,asix)