kmod-crypto-hw-talitos: add missing dependency

[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 7996d03..d9d673c 100644 (file)
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -7,12 +7,13 @@
 
 CRYPTO_MENU:=Cryptographic API modules
 
-CRYPTO_MODULES = ALGAPI2=crypto_algapi
+CRYPTO_MODULES = \
+       ALGAPI2=crypto_algapi \
+       BLKCIPHER2=crypto_blkcipher
 
 CRYPTOMGR_MODULES = \
        AEAD2=aead \
        MANAGER2=cryptomgr \
-       BLKCIPHER2=crypto_blkcipher
 
 crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
 crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko
@@ -24,6 +25,7 @@ define KernelPackage/crypto-core
   KCONFIG:= \
        CONFIG_CRYPTO=y \
        CONFIG_CRYPTO_HW=y \
+       CONFIG_CRYPTO_BLKCIPHER \
        CONFIG_CRYPTO_ALGAPI \
        $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
   FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
@@ -53,7 +55,6 @@ define KernelPackage/crypto-manager
   DEPENDS:=+kmod-crypto-hash +kmod-crypto-pcompress
   KCONFIG:= \
        CONFIG_CRYPTO_AEAD \
-       CONFIG_CRYPTO_BLKCIPHER \
        CONFIG_CRYPTO_MANAGER \
        $(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_confvar,$(mod)))
   FILES:=$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_file,$(mod)))
@@ -132,7 +133,7 @@ $(eval $(call KernelPackage,crypto-iv))
 
 define KernelPackage/crypto-hw-talitos
   TITLE:=Freescale integrated security engine (SEC) driver
-  DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager +kmod-crypto-hash +kmod-random-core
+  DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc
   KCONFIG:= \
        CONFIG_CRYPTO_DEV_TALITOS
   FILES:= \
@@ -207,16 +208,23 @@ $(eval $(call KernelPackage,crypto-hw-ppc4xx))
 
 define KernelPackage/crypto-hw-omap
   TITLE:=TI OMAP hardware crypto modules
-  DEPENDS:=@TARGET_omap4
+  DEPENDS:=@TARGET_omap
   KCONFIG:= \
        CONFIG_CRYPTO_DEV_OMAP_AES \
        CONFIG_CRYPTO_DEV_OMAP_DES \
        CONFIG_CRYPTO_DEV_OMAP_SHAM
+ifneq ($(wildcard $(LINUX_DIR)/drivers/crypto/omap-des.ko),)
   FILES:= \
        $(LINUX_DIR)/drivers/crypto/omap-aes.ko \
        $(LINUX_DIR)/drivers/crypto/omap-des.ko \
        $(LINUX_DIR)/drivers/crypto/omap-sham.ko
   AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-des omap-sham)
+else
+  FILES:= \
+       $(LINUX_DIR)/drivers/crypto/omap-aes.ko \
+       $(LINUX_DIR)/drivers/crypto/omap-sham.ko
+  AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-sham)
+endif
   $(call AddDepends/crypto,+kmod-crypto-manager +kmod-crypto-hash)
 endef
 
@@ -248,7 +256,7 @@ define KernelPackage/crypto-arc4
   KCONFIG:=CONFIG_CRYPTO_ARC4
   FILES:=$(LINUX_DIR)/crypto/arc4.ko
   AUTOLOAD:=$(call AutoLoad,09,arc4)
-  $(call AddDepends/crypto,+!LINUX_3_3:kmod-crypto-manager)
+  $(call AddDepends/crypto)
 endef
 
 $(eval $(call KernelPackage,crypto-arc4))
@@ -276,12 +284,28 @@ endef
 
 $(eval $(call KernelPackage,crypto-cbc))
 
+define KernelPackage/crypto-pcbc
+  TITLE:=Propagating Cipher Block Chaining CryptoAPI module
+  DEPENDS:=+kmod-crypto-manager
+  KCONFIG:=CONFIG_CRYPTO_PCBC
+  FILES:=$(LINUX_DIR)/crypto/pcbc.ko
+  AUTOLOAD:=$(call AutoLoad,09,pcbc)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-pcbc))
+
 define KernelPackage/crypto-crc32c
   TITLE:=CRC32c CRC module
   DEPENDS:=+kmod-crypto-hash
   KCONFIG:=CONFIG_CRYPTO_CRC32C
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.15.0)),1)
+  FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko
+  AUTOLOAD:=$(call AutoLoad,04,crc32c_generic,1)
+else
   FILES:=$(LINUX_DIR)/crypto/crc32c.ko
   AUTOLOAD:=$(call AutoLoad,04,crc32c,1)
+endif
   $(call AddDepends/crypto)
 endef
 
@@ -311,6 +335,16 @@ endef
 $(eval $(call KernelPackage,crypto-deflate))
 
 
+define KernelPackage/crypto-fcrypt
+  TITLE:=FCRYPT cipher CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_FCRYPT
+  FILES:=$(LINUX_DIR)/crypto/fcrypt.ko
+  AUTOLOAD:=$(call AutoLoad,09,fcrypt)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-fcrypt))
+
 define KernelPackage/crypto-ecb
   TITLE:=Electronic CodeBook CryptoAPI module
   DEPENDS:=+kmod-crypto-manager
@@ -428,7 +462,6 @@ define KernelPackage/crypto-misc
        $(if $(call kernel_patchver_ge,3.7),$(LINUX_DIR)/crypto/cast_common.ko) \
        $(LINUX_DIR)/crypto/cast5$(cast56_mod_suffix).ko \
        $(LINUX_DIR)/crypto/cast6$(cast56_mod_suffix).ko \
-       $(LINUX_DIR)/crypto/fcrypt.ko \
        $(LINUX_DIR)/crypto/khazad.ko \
        $(LINUX_DIR)/crypto/sha512_generic.ko \
        $(LINUX_DIR)/crypto/tea.ko \