modules: update dependencies and .ko locations to cover 5.10 changes

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk
index b7767b3d16de9435d7e826a20110c9ca1f109305..6b3ed68df734469ef682a8e32d5fd399aaeeac79 100644 (file)
--- a/package/kernel/linux/modules/block.mk
+++ b/package/kernel/linux/modules/block.mk
@@ -218,7 +218,7 @@ $(eval $(call KernelPackage,dax))
 define KernelPackage/dm
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Device Mapper
-  DEPENDS:=+kmod-crypto-manager +kmod-dax
+  DEPENDS:=+kmod-crypto-manager +kmod-dax +LINUX_5_10:kmod-keys-encrypted
   # All the "=n" are unnecessary, they're only there
   # to stop the config from asking the question.
   # MIRROR is M because I've needed it for pvmove.

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index a0db14ecfed7b10648c2e7b309a82777396ff25f..91ef5358219d7d56c9dc0f412640272ac87bc405 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -368,7 +368,8 @@ define KernelPackage/fs-nfs-common
   FILES:= \
        $(LINUX_DIR)/fs/lockd/lockd.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
   AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
 endef
 

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 5f7a80bf22c83e0cab366a75753d5a12cfa3204e..a6113a583423a667008762cb13bdfdde5903f2f1 100644 (file)
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -146,8 +146,10 @@ define KernelPackage/mdio-gpio
        CONFIG_MDIO_BITBANG \
        CONFIG_MDIO_GPIO
   FILES:= \
-       $(LINUX_DIR)/drivers/net/phy/mdio-gpio.ko \
-       $(LINUX_DIR)/drivers/net/phy/mdio-bitbang.ko
+       $(LINUX_DIR)/drivers/net/phy/mdio-gpio.ko@lt5.10 \
+       $(LINUX_DIR)/drivers/net/mdio/mdio-gpio.ko@ge5.10 \
+       $(LINUX_DIR)/drivers/net/phy/mdio-bitbang.ko@lt5.10 \
+       $(LINUX_DIR)/drivers/net/mdio/mdio-bitbang.ko@ge5.10
   AUTOLOAD:=$(call AutoProbe,mdio-gpio)
 endef
 
@@ -990,7 +992,8 @@ define KernelPackage/of-mdio
   KCONFIG:=CONFIG_OF_MDIO
   FILES:= \
        $(LINUX_DIR)/drivers/net/phy/fixed_phy.ko \
-       $(LINUX_DIR)/drivers/of/of_mdio.ko
+       $(LINUX_DIR)/drivers/of/of_mdio.ko@lt5.10 \
+       $(LINUX_DIR)/drivers/net/mdio/of_mdio.ko@ge5.10
   AUTOLOAD:=$(call AutoLoad,41,of_mdio)
 endef
 
@@ -1165,7 +1168,8 @@ define KernelPackage/sfp
        CONFIG_MDIO_I2C
   FILES:= \
        $(LINUX_DIR)/drivers/net/phy/sfp.ko \
-       $(LINUX_DIR)/drivers/net/phy/mdio-i2c.ko
+       $(LINUX_DIR)/drivers/net/phy/mdio-i2c.ko@lt5.10 \
+       $(LINUX_DIR)/drivers/net/mdio/mdio-i2c.ko@ge5.10
   AUTOLOAD:=$(call AutoProbe,mdio-i2c sfp)
 endef
 

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 83d998c83a5153360d337dca8283e44cc89aa608..b4a7360485f23adb41a834970467ff0ca2191469 100644 (file)
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -1126,7 +1126,9 @@ 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
+  FILES:=\
+       $(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)
 endef
 

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 3dd20a06966aee5a03233e7d4cff8ed4a58d3be5..b9fc10a0a57c7fb8650b32abfa4c75d4210fb801 100644 (file)
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -412,7 +412,7 @@ $(eval $(call KernelPackage,usb2-pci))
 
 define KernelPackage/usb-dwc2
   TITLE:=DWC2 USB controller driver
-  DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget
+  DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget +LINUX_5_10:kmod-usb-roles
   KCONFIG:= \
        CONFIG_USB_PCI=y \
        CONFIG_USB_DWC2 \
@@ -1590,7 +1590,7 @@ $(eval $(call KernelPackage,usbip-server))
 
 define KernelPackage/usb-chipidea
   TITLE:=Host and device support for Chipidea controllers
-  DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop
+  DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop +LINUX_5_10:kmod-usb-roles
   KCONFIG:= \
        CONFIG_EXTCON \
        CONFIG_USB_CHIPIDEA \
@@ -1600,8 +1600,7 @@ define KernelPackage/usb-chipidea
   FILES:= \
        $(LINUX_DIR)/drivers/extcon/extcon-core.ko \
        $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
-       $(LINUX_DIR)/drivers/usb/common/ulpi.ko \
-       $(LINUX_DIR)/drivers/usb/roles/roles.ko
+       $(LINUX_DIR)/drivers/usb/common/ulpi.ko
   AUTOLOAD:=$(call AutoLoad,39,ci_hdrc,1)
   $(call AddDepends/usb)
 endef
@@ -1682,6 +1681,23 @@ endef
 $(eval $(call KernelPackage,usb3))
 
 
+define KernelPackage/usb-roles
+  TITLE:=USB Role Switch support
+  KCONFIG:= \
+       CONFIG_USB_ROLE_SWITCH
+  FILES:= \
+       $(LINUX_DIR)/drivers/usb/roles/roles.ko
+  AUTOLOAD:=$(call AutoLoad,39,roles,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-roles/description
+ Kernel support for USB Role Switch
+endef
+
+$(eval $(call KernelPackage,usb-roles))
+
+
 define KernelPackage/usb-net2280
   TITLE:=Support for NetChip 228x PCI USB peripheral controller
   KCONFIG:= \