diff options
| -rw-r--r-- | package/kernel/linux/modules/block.mk | 2 | ||||
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 13 | ||||
| -rw-r--r-- | package/kernel/linux/modules/fs.mk | 3 | ||||
| -rw-r--r-- | package/kernel/linux/modules/netdevices.mk | 12 | ||||
| -rw-r--r-- | package/kernel/linux/modules/other.mk | 4 | ||||
| -rw-r--r-- | package/kernel/linux/modules/usb.mk | 26 |
6 files changed, 44 insertions, 16 deletions
diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index b7767b3d16..e5822d95d7 100644 --- 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 +KERNEL_KEYS: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/crypto.mk b/package/kernel/linux/modules/crypto.mk index e9e78e7967..ba3211c10a 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -38,7 +38,9 @@ define KernelPackage/crypto-aead KCONFIG:= \ CONFIG_CRYPTO_AEAD \ CONFIG_CRYPTO_AEAD2 - FILES:=$(LINUX_DIR)/crypto/aead.ko + FILES:= \ + $(LINUX_DIR)/crypto/aead.ko \ + $(LINUX_DIR)/crypto/geniv.ko@ge5.10 AUTOLOAD:=$(call AutoLoad,09,aead,1) $(call AddDepends/crypto, +kmod-crypto-null) endef @@ -48,8 +50,12 @@ $(eval $(call KernelPackage,crypto-aead)) define KernelPackage/crypto-arc4 TITLE:=ARC4 cipher CryptoAPI module - KCONFIG:=CONFIG_CRYPTO_ARC4 - FILES:=$(LINUX_DIR)/crypto/arc4.ko + KCONFIG:= \ + CONFIG_CRYPTO_ARC4 \ + CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y + FILES:= \ + $(LINUX_DIR)/crypto/arc4.ko \ + $(LINUX_DIR)/lib/crypto/libarc4.ko AUTOLOAD:=$(call AutoLoad,09,arc4) $(call AddDepends/crypto) endef @@ -492,6 +498,7 @@ define KernelPackage/crypto-misc TITLE:=Other CryptoAPI modules DEPENDS:=+kmod-crypto-xts KCONFIG:= \ + CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y \ CONFIG_CRYPTO_CAMELLIA_X86_64 \ CONFIG_CRYPTO_BLOWFISH_X86_64 \ CONFIG_CRYPTO_TWOFISH_X86_64 \ diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index a0db14ecfe..91ef535821 100644 --- 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 5f7a80bf22..76675589fc 100644 --- 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/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 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 83d998c83a..cfd133f19f 100644 --- 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 3dd20a0696..e7498af31c 100644 --- 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 +kmod-usb-roles KCONFIG:= \ CONFIG_USB_PCI=y \ CONFIG_USB_DWC2 \ @@ -1325,7 +1325,7 @@ define KernelPackage/usb-net-rtl8152 KCONFIG:=CONFIG_USB_RTL8152 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko AUTOLOAD:=$(call AutoProbe,r8152) - $(call AddDepends/usb-net) + $(call AddDepends/usb-net, +LINUX_5_10:kmod-crypto-hash) endef define KernelPackage/usb-net-rtl8152/description @@ -1587,21 +1587,20 @@ endef $(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 +kmod-usb-roles KCONFIG:= \ CONFIG_EXTCON \ CONFIG_USB_CHIPIDEA \ + CONFIG_USB_CHIPIDEA_GENERIC \ CONFIG_USB_CHIPIDEA_HOST=y \ CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y 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 @@ -1699,6 +1698,21 @@ endef $(eval $(call KernelPackage,usb-net2280)) +define KernelPackage/usb-roles + TITLE:=USB Role Switch Library Module + KCONFIG:=CONFIG_USB_ROLE_SWITCH + HIDDEN:=1 + FILES:=$(LINUX_DIR)/drivers/usb/roles/roles.ko + $(call AddDepends/usb) +endef + +define KernelPackage/usb-roles/description + Support for USB Role Switch +endef + +$(eval $(call KernelPackage,usb-roles)) + + define KernelPackage/chaoskey SUBMENU:=$(USB_MENU) TITLE:=Chaoskey hardware RNG support |