kernel: Add dependencies for kernel 4.19

[openwrt/openwrt.git] / package / kernel / linux / modules / crypto.mk

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index 235e6dadac0f2e6bab9865d5f016478b8de3800e..d70eb924c32030d8f0192d18ee933a810ff00fdf 100644 (file)
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -145,7 +145,7 @@ $(eval $(call KernelPackage,crypto-cts))
 
 define KernelPackage/crypto-deflate
   TITLE:=Deflate compression CryptoAPI module
-  DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +LINUX_4_14:kmod-crypto-acompress
+  DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +!(LINUX_3_18||LINUX_4_9):kmod-crypto-acompress
   KCONFIG:=CONFIG_CRYPTO_DEFLATE
   FILES:=$(LINUX_DIR)/crypto/deflate.ko
   AUTOLOAD:=$(call AutoLoad,09,deflate)
@@ -180,7 +180,7 @@ $(eval $(call KernelPackage,crypto-ecb))
 
 define KernelPackage/crypto-ecdh
   TITLE:=ECDH algorithm
-  DEPENDS:=@!(LINUX_3_18||LINUX_4_4) +kmod-crypto-kpp
+  DEPENDS:=@!LINUX_3_18 +kmod-crypto-kpp
   KCONFIG:= CONFIG_CRYPTO_ECDH
   FILES:= \
        $(LINUX_DIR)/crypto/ecdh_generic.ko
@@ -274,7 +274,7 @@ $(eval $(call KernelPackage,crypto-hmac))
 
 define KernelPackage/crypto-hw-ccp
   TITLE:=AMD Cryptographic Coprocessor
-  DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 +LINUX_4_14:kmod-crypto-rsa
+  DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 +!(LINUX_3_18||LINUX_4_9):kmod-crypto-rsa
   KCONFIG:= \
        CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_DEV_CCP=y \
@@ -500,10 +500,11 @@ ifndef CONFIG_TARGET_x86_64
        $(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \
        $(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \
        $(LINUX_DIR)/arch/x86/crypto/glue_helper.ko \
-       $(LINUX_DIR)/crypto/ablk_helper.ko \
+       $(LINUX_DIR)/crypto/ablk_helper.ko@lt4.17 \
        $(LINUX_DIR)/crypto/cryptd.ko \
-       $(LINUX_DIR)/crypto/lrw.ko
-    AUTOLOAD+= $(call AutoLoad,10,lrw cryptd ablk_helper glue_helper \
+       $(LINUX_DIR)/crypto/lrw.ko@lt4.17 \
+       $(LINUX_DIR)/crypto/crypto_simd.ko@ge4.17
+    AUTOLOAD+= $(call AutoLoad,10,cryptd glue_helper \
        serpent-sse2-i586 twofish-i586 blowfish_generic)
   endef
 endif
@@ -522,8 +523,8 @@ define KernelPackage/crypto-misc/x86/64
        $(LINUX_DIR)/arch/x86/crypto/serpent-avx-x86_64.ko \
        $(LINUX_DIR)/arch/x86/crypto/camellia-aesni-avx2.ko \
        $(LINUX_DIR)/arch/x86/crypto/serpent-avx2.ko \
-       $(LINUX_DIR)/crypto/ablk_helper.ko
-  AUTOLOAD+= $(call AutoLoad,10,ablk_helper camellia-x86_64 \
+       $(LINUX_DIR)/crypto/ablk_helper.ko@lt4.17
+  AUTOLOAD+= $(call AutoLoad,10,camellia-x86_64 \
        camellia-aesni-avx-x86_64 camellia-aesni-avx2 cast5-avx-x86_64 \
        cast6-avx-x86_64 twofish-x86_64 twofish-x86_64-3way \
        twofish-avx-x86_64 blowfish-x86_64 serpent-avx-x86_64 serpent-avx2)
@@ -570,11 +571,10 @@ $(eval $(call KernelPackage,crypto-pcompress))
 
 define KernelPackage/crypto-rsa
   TITLE:=RSA algorithm
-  DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager
+  DEPENDS:=@!LINUX_3_18 +kmod-crypto-manager +kmod-asn1-decoder
   KCONFIG:= CONFIG_CRYPTO_RSA
   HIDDEN:=1
   FILES:= \
-       $(LINUX_DIR)/lib/asn1_decoder.ko \
        $(LINUX_DIR)/lib/mpi/mpi.ko \
        $(LINUX_DIR)/crypto/akcipher.ko \
        $(LINUX_DIR)/crypto/rsa_generic.ko