bcm63xx: Really fix the flash driver in 2.6.37

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

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index aaa9d53..b3609d0 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -24,11 +24,9 @@ SHA512_SUFFIX:=$(CRYPTO_GENERIC)
 CRYPTO_MODULES = \
        ALGAPI2=crypto_algapi \
        AEAD2=aead \
 CRYPTO_MODULES = \
        ALGAPI2=crypto_algapi \
        AEAD2=aead \

-       $(if $(filter 1,$(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)),PCOMP2,PCOMP)=pcompress \

        BLKCIPHER2=crypto_blkcipher \
        HASH2=crypto_hash \
        MANAGER2=cryptomgr \
        BLKCIPHER2=crypto_blkcipher \
        HASH2=crypto_hash \
        MANAGER2=cryptomgr \

-       CBC=cbc \

        ECB=ecb
 
 crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
        ECB=ecb
 
 crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))


@@ -44,6 +42,11 @@ define KernelPackage/crypto-core
        CONFIG_CRYPTO=y \
        CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_HMAC \
        CONFIG_CRYPTO=y \
        CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_HMAC \

+       CONFIG_CRYPTO_AEAD \
+       CONFIG_CRYPTO_ALGAPI \
+       CONFIG_CRYPTO_BLKCIPHER \
+       CONFIG_CRYPTO_HASH \
+       CONFIG_CRYPTO_MANAGER \

        $(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))))
        $(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))))


@@ -172,6 +175,16 @@ endef
 
 $(eval $(call KernelPackage,crypto-authenc))
 
 
 $(eval $(call KernelPackage,crypto-authenc))
 

+define KernelPackage/crypto-cbc
+  TITLE:=Cipher Block Chaining CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_CBC
+  FILES:=$(LINUX_DIR)/crypto/cbc.ko
+  AUTOLOAD:=$(call AutoLoad,09,cbc)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-cbc))
+

 define KernelPackage/crypto-des
   TITLE:=DES/3DES cipher CryptoAPI module
   KCONFIG:=CONFIG_CRYPTO_DES
 define KernelPackage/crypto-des
   TITLE:=DES/3DES cipher CryptoAPI module
   KCONFIG:=CONFIG_CRYPTO_DES