---

yaml --- r: 72363 b: refs/heads/master c: 9b58aeb h: refs/heads/master i: 72361: 10d575f 72359: f7eb8ee v: v3
git-mirror · Oct 23, 2007 · 02e5d4f · 02e5d4f
1 parent 6569979
commit 02e5d4f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 30 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bec2c48c2045ca467d07bba54783318b8672bda7
+refs/heads/master: 9b58aebc73095c045826d891f8e8de6d5bd48c12
diff --git a/trunk/arch/x86/crypto/Makefile b/trunk/arch/x86/crypto/Makefile
@@ -1,5 +1,15 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/crypto/Makefile_32
-else
-include ${srctree}/arch/x86/crypto/Makefile_64
-endif
+#
+# Arch-specific CryptoAPI modules.
+#
+
+obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
+obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
+
+obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
+obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
+
+aes-i586-y := aes-i586-asm_32.o aes_32.o
+twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
+
+aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o
+twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o
diff --git a/trunk/arch/x86/crypto/Makefile_32 b/trunk/arch/x86/crypto/Makefile_32
diff --git a/trunk/arch/x86/crypto/Makefile_64 b/trunk/arch/x86/crypto/Makefile_64