---

yaml --- r: 329734 b: refs/heads/master c: f0be44f h: refs/heads/master v: v3
git-mirror · Sep 6, 2012 · aee6eb4 · aee6eb4
1 parent 05e19b1
commit aee6eb4
Show file tree

Hide file tree

Showing 8 changed files with 1,946 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 956c203c5e370c7beb766400b5c1a32ec570ce96
+refs/heads/master: f0be44f4fb1faee42635ca5ea06dc9c3e820a35d
diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
@@ -255,6 +255,7 @@ core-$(CONFIG_VFP)		+= arch/arm/vfp/
 # If we have a machine-specific directory, then include it in the build.
 core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
 core-y				+= arch/arm/net/
+core-y				+= arch/arm/crypto/
 core-y				+= $(machdirs) $(platdirs)
 
 drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

diff --git a/trunk/arch/arm/crypto/Makefile b/trunk/arch/arm/crypto/Makefile
@@ -0,0 +1,9 @@
+#
+# Arch-specific CryptoAPI modules.
+#
+
+obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o
+obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o
+
+aes-arm-y  := aes-armv4.o aes_glue.o
+sha1-arm-y := sha1-armv4-large.o sha1_glue.o