X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fcrypto.mk;h=012b68befaf1e31b15b3ffa8bbffcb4c18b8961b;hb=0fd5c228ecc77d51e51296a9a581318bcfad60a7;hp=d2a0bac95a648a8eb8154bda91d4ae5e4e15dc24;hpb=bdf8b570321392a170b8f24962e65011812ebbbe;p=openwrt.git

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index d2a0bac95a..012b68befa 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -31,11 +31,13 @@ endif
 AEAD_CONF:=AEAD
 MANAGER_CONF:=MANAGER
 BLKCIPHER_CONF:=BLKCIPHER
+HASH_CONF:=HASH
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
   CRYPTO_MODULE_PCOMPRESS:=PCOMP=pcompress
   AEAD_CONF:=AEAD2
   MANAGER_CONF:=MANAGER2
   BLKCIPHER_CONF:=BLKCIPHER2
+  HASH_CONF:=HASH2
 endif
 
 CRYPTO_MODULES = \
@@ -43,7 +45,7 @@ CRYPTO_MODULES = \
 	$(AEAD_CONF)=aead \
 	$(CRYPTO_MODULE_PCOMPRESS) \
 	$(BLKCIPHER_CONF)=$(BLKCIPHER_PREFIX)blkcipher \
-	HASH=crypto_hash \
+	$(HASH_CONF)=crypto_hash \
 	$(MANAGER_CONF)=cryptomgr \
 	CBC=cbc \
 	ECB=ecb \
@@ -106,7 +108,7 @@ $(eval $(call KernelPackage,crypto-hw-geode))
 define KernelPackage/crypto-hw-hifn-795x
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=HIFN 795x crypto accelerator
-  DEPENDS:=+kmod-crypto-core +kmod-crypto-des
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-des @!TARGET_ubicom32
   KCONFIG:= \
 	CONFIG_CRYPTO_HW=y \
 	CONFIG_CRYPTO_DEV_HIFN_795X \
@@ -137,6 +139,25 @@ endef
 $(eval $(call KernelPackage,crypto-hw-ixp4xx))
 
 
+define KernelPackage/crypto-hw-ppc4xx
+  SUBMENU:=$(CRYPTO_MENU)
+  TITLE:=AMCC PPC4xx hardware crypto module
+  DEPENDS:= \
+	@TARGET_ppc40x||TARGET_ppc44x +kmod-crypto-core
+  KCONFIG:= \
+	CONFIG_CRYPTO_HW=y \
+	CONFIG_CRYPTO_DEV_PPC4XX
+  FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,crypto4xx)
+endef
+
+define KernelPackage/crypto-hw-ppc4xx/description
+  Kernel support for the AMCC PPC4xx HW crypto engine.
+endef
+
+$(eval $(call KernelPackage,crypto-hw-ppc4xx))
+
+
 define KernelPackage/crypto-aes
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=AES cipher CryptoAPI module