kernel: modules: adapt for kernel 6.1

Adapt kernel modules to support kernel 6.1.

Fixes: #11210
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2022-10-20 03:13:50 +02:00 committed by AmadeusGhost
parent a0948d91a1
commit d52eb58fca
5 changed files with 25 additions and 10 deletions

View File

@ -52,7 +52,7 @@ define KernelPackage/hwmon-adt7410
$(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
$(LINUX_DIR)/drivers/hwmon/adt7410.ko
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
define KernelPackage/hwmon-adt7410/description

View File

@ -84,6 +84,20 @@ endef
$(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:= \
CONFIG_I2C_DESIGNWARE_CORE:drivers/i2c/busses/i2c-designware-core
@ -103,7 +117,7 @@ I2C_DWPCI_MODULES:= \
define KernelPackage/i2c-designware-pci
$(call i2c_defaults,$(I2C_DWPCI_MODULES),59)
TITLE:=Synopsys DesignWare PCI
DEPENDS:=+kmod-i2c-designware-core
DEPENDS:=+kmod-i2c-designware-core +kmod-i2c-ccgs-ucsi
endef
define KernelPackage/i2c-designware-pci/description

View File

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

View File

@ -1151,15 +1151,15 @@ define KernelPackage/nft-offload
DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat
KCONFIG:= \
CONFIG_NF_FLOW_TABLE_INET \
CONFIG_NF_FLOW_TABLE_IPV4 \
CONFIG_NF_FLOW_TABLE_IPV6 \
CONFIG_NF_FLOW_TABLE_IPV4@lt5.17 \
CONFIG_NF_FLOW_TABLE_IPV6@lt5.17 \
CONFIG_NFT_FLOW_OFFLOAD
FILES:= \
$(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \
$(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko \
$(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko \
$(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko@lt5.17 \
$(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko@lt5.17 \
$(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
$(eval $(call KernelPackage,nft-offload))

View File

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