summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2015-03-07 03:46:21 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2015-03-09 13:06:19 +0300
commit3265c4babe93832167cb148083a0544548c23e6a (patch)
treefa78a5f4d61fec514792367ef0c24a827da2b6eb
parenta508412b169d5398dc5f800147097b255c2941be (diff)
downloadlinux-3265c4babe93832167cb148083a0544548c23e6a.tar.xz
crypto: powerpc - move files to fix build error
The current cryptodev-2.6 tree commits: d9850fc529ef ("crypto: powerpc/sha1 - kernel config") 50ba29aaa7b0 ("crypto: powerpc/sha1 - glue") failed to properly place files under arch/powerpc/crypto, which leads to build errors: make[1]: *** No rule to make target 'arch/powerpc/crypto/sha1-spe-asm.o', needed by 'arch/powerpc/crypto/sha1-ppc-spe.o'. Stop. make[1]: *** No rule to make target 'arch/powerpc/crypto/sha1_spe_glue.o', needed by 'arch/powerpc/crypto/sha1-ppc-spe.o'. Stop. Makefile:947: recipe for target 'arch/powerpc/crypto' failed Move the two sha1 spe files under crypto/, and whilst there, rename other powerpc crypto files with underscores to use dashes for consistency. Cc: Markus Stockhausen <stockhausen@collogia.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--arch/powerpc/crypto/Makefile8
-rw-r--r--arch/powerpc/crypto/aes-spe-glue.c (renamed from arch/powerpc/crypto/aes_spe_glue.c)0
-rw-r--r--arch/powerpc/crypto/md5-glue.c (renamed from arch/powerpc/crypto/md5_glue.c)0
-rw-r--r--arch/powerpc/crypto/sha1-spe-asm.S (renamed from arch/powerpc/sha1-spe-asm.S)0
-rw-r--r--arch/powerpc/crypto/sha1-spe-glue.c (renamed from arch/powerpc/sha1_spe_glue.c)0
-rw-r--r--arch/powerpc/crypto/sha256-spe-glue.c (renamed from arch/powerpc/crypto/sha256_spe_glue.c)0
6 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile
index c6b25cba3a0c..9c221b69c181 100644
--- a/arch/powerpc/crypto/Makefile
+++ b/arch/powerpc/crypto/Makefile
@@ -10,8 +10,8 @@ obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o
obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o
obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o
-aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes_spe_glue.o
-md5-ppc-y := md5-asm.o md5_glue.o
+aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes-spe-glue.o
+md5-ppc-y := md5-asm.o md5-glue.o
sha1-powerpc-y := sha1-powerpc-asm.o sha1.o
-sha1-ppc-spe-y := sha1-spe-asm.o sha1_spe_glue.o
-sha256-ppc-spe-y := sha256-spe-asm.o sha256_spe_glue.o
+sha1-ppc-spe-y := sha1-spe-asm.o sha1-spe-glue.o
+sha256-ppc-spe-y := sha256-spe-asm.o sha256-spe-glue.o
diff --git a/arch/powerpc/crypto/aes_spe_glue.c b/arch/powerpc/crypto/aes-spe-glue.c
index bd5e63f72ad4..bd5e63f72ad4 100644
--- a/arch/powerpc/crypto/aes_spe_glue.c
+++ b/arch/powerpc/crypto/aes-spe-glue.c
diff --git a/arch/powerpc/crypto/md5_glue.c b/arch/powerpc/crypto/md5-glue.c
index 452fb4dc575f..452fb4dc575f 100644
--- a/arch/powerpc/crypto/md5_glue.c
+++ b/arch/powerpc/crypto/md5-glue.c
diff --git a/arch/powerpc/sha1-spe-asm.S b/arch/powerpc/crypto/sha1-spe-asm.S
index fcb6cf002889..fcb6cf002889 100644
--- a/arch/powerpc/sha1-spe-asm.S
+++ b/arch/powerpc/crypto/sha1-spe-asm.S
diff --git a/arch/powerpc/sha1_spe_glue.c b/arch/powerpc/crypto/sha1-spe-glue.c
index 3e1d22212521..3e1d22212521 100644
--- a/arch/powerpc/sha1_spe_glue.c
+++ b/arch/powerpc/crypto/sha1-spe-glue.c
diff --git a/arch/powerpc/crypto/sha256_spe_glue.c b/arch/powerpc/crypto/sha256-spe-glue.c
index f4a616fe1a82..f4a616fe1a82 100644
--- a/arch/powerpc/crypto/sha256_spe_glue.c
+++ b/arch/powerpc/crypto/sha256-spe-glue.c