[package] kernel: change dependency on kmod-nfs-common in kmod-nfs & kmod-nfsd from...

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

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index ebef3b8..ef62726 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 CRYPTO_MENU:=Cryptographic API modules
 
@@ -29,42 +28,33 @@ endif
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
   SHA512_SUFFIX:=$(CRYPTO_GENERIC)
 endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
+  CRYPTO_MODULE_PCOMPRESS:=PCOMP=pcompress
+endif
+
+CRYPTO_MODULES = \
+       ALGAPI=crypto_algapi \
+       AEAD=aead \
+       $(CRYPTO_MODULE_PCOMPRESS) \
+       BLKCIPHER=$(BLKCIPHER_PREFIX)blkcipher \
+       HASH=crypto_hash \
+       MANAGER=cryptomgr \
+       CBC=cbc \
+       ECB=ecb \
+       DEFLATE=deflate
+
+crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
+crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).$(LINUX_KMOD_SUFFIX))
+crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1))))
 
 # XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is
 # always set, even if no hash modules are selected
 define KernelPackage/crypto-core
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Core CryptoAPI modules
-  KCONFIG:= \
-       CONFIG_CRYPTO=y \
-       CONFIG_CRYPTO_AEAD \
-       CONFIG_CRYPTO_ALGAPI \
-       CONFIG_CRYPTO_BLKCIPHER \
-       CONFIG_CRYPTO_CBC \
-       CONFIG_CRYPTO_DEFLATE \
-       CONFIG_CRYPTO_ECB \
-       CONFIG_CRYPTO_HASH \
-       CONFIG_CRYPTO_HMAC \
-       CONFIG_CRYPTO_MANAGER
-  FILES:= \
-       $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/aead.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/$(BLKCIPHER_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/crypto_hash.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/cryptomgr.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,01, \
-       crypto_algapi \
-       aead \
-       cryptomgr \
-       crypto_hash \
-       $(BLKCIPHER_PREFIX)blkcipher \
-       cbc \
-       ecb \
-       deflate \
-  )
+  KCONFIG:=CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
+  FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
+  AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_name,$(mod))))
 endef
 
 define KernelPackage/crypto-core/2.4
@@ -127,7 +117,9 @@ define KernelPackage/crypto-hw-ixp4xx
   TITLE:=Intel IXP4xx hardware crypto module
   DEPENDS:= \
        @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-authenc
-  KCONFIG:= CONFIG_CRYPTO_DEV_IXP4XX
+  KCONFIG:= \
+       CONFIG_CRYPTO_HW=y \
+       CONFIG_CRYPTO_DEV_IXP4XX
   FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
 endef
@@ -143,13 +135,12 @@ define KernelPackage/crypto-aes
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=AES cipher CryptoAPI module
   DEPENDS:=+kmod-crypto-core
-  KCONFIG:=CONFIG_CRYPTO_AES
+  KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586
   FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX))
 endef
 
 define KernelPackage/crypto-aes/x86-2.6
-  KCONFIG+=CONFIG_CRYPTO_AES_586
   FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX) aes-i586)
 endef