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 49c5684..b3609d0 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -22,15 +22,12 @@ SHA256_SUFFIX:=$(CRYPTO_GENERIC)
 SHA512_SUFFIX:=$(CRYPTO_GENERIC)
 
 CRYPTO_MODULES = \
 SHA512_SUFFIX:=$(CRYPTO_GENERIC)
 
 CRYPTO_MODULES = \

-       $(if $(filter 1,$(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),ALGAPI2,ALGAPI)=crypto_algapi \
+       ALGAPI2=crypto_algapi \

        AEAD2=aead \
        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 \
-       DEFLATE=deflate
+       ECB=ecb

 
 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))).ko)
 
 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))).ko)


@@ -45,16 +42,15 @@ 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))))
 endef
        $(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
-  FILES:=$(LINUX_DIR)/crypto/deflate.ko
-  AUTOLOAD:=$(call AutoLoad,01, deflate)
-endef
-

 $(eval $(call KernelPackage,crypto-core))
 
 
 $(eval $(call KernelPackage,crypto-core))
 
 


@@ -179,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


@@ -189,6 +195,16 @@ endef
 
 $(eval $(call KernelPackage,crypto-des))
 
 
 $(eval $(call KernelPackage,crypto-des))
 

+define KernelPackage/crypto-deflate
+  TITLE:=Deflate compression CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_DEFLATE
+  FILES:=$(LINUX_DIR)/crypto/deflate.ko
+  AUTOLOAD:=$(call AutoLoad,09,deflate)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-deflate))
+

 
 define KernelPackage/crypto-hmac
   TITLE:=HMAC digest CryptoAPI module
 
 define KernelPackage/crypto-hmac
   TITLE:=HMAC digest CryptoAPI module


@@ -374,7 +390,7 @@ endef
 
 $(eval $(call KernelPackage,crypto-xts))
 
 
 $(eval $(call KernelPackage,crypto-xts))
 

-define KernelPackage/crypto-mv_cesa
+define KernelPackage/crypto-mv-cesa

    TITLE:=Marvell crypto engine
    KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA
    FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko
    TITLE:=Marvell crypto engine
    KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA
    FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko


@@ -383,4 +399,4 @@ define KernelPackage/crypto-mv_cesa
    DEPENDS:=kmod-crypto-core @TARGET_kirkwood||TARGET_orion
 endef
 
    DEPENDS:=kmod-crypto-core @TARGET_kirkwood||TARGET_orion
 endef
 

-$(eval $(call KernelPackage,crypto-mv_cesa))
+$(eval $(call KernelPackage,crypto-mv-cesa))