diff options
| -rw-r--r-- | arch/arm64/lib/.gitignore | 4 | ||||
| -rw-r--r-- | arch/arm64/lib/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm64/lib/crypto/.gitignore | 3 | ||||
| -rw-r--r-- | lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | lib/crypto/Makefile | 3 | ||||
| -rw-r--r-- | lib/crypto/arm64/.gitignore | 2 | ||||
| -rw-r--r-- | lib/crypto/arm64/Kconfig (renamed from arch/arm64/lib/crypto/Kconfig) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/Makefile (renamed from arch/arm64/lib/crypto/Makefile) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/chacha-neon-core.S (renamed from arch/arm64/lib/crypto/chacha-neon-core.S) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/chacha-neon-glue.c (renamed from arch/arm64/lib/crypto/chacha-neon-glue.c) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/poly1305-armv8.pl (renamed from arch/arm64/lib/crypto/poly1305-armv8.pl) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/poly1305-glue.c (renamed from arch/arm64/lib/crypto/poly1305-glue.c) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/sha2-armv8.pl (renamed from arch/arm64/lib/crypto/sha2-armv8.pl) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/sha256-ce.S (renamed from arch/arm64/lib/crypto/sha256-ce.S) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm64/sha256.c (renamed from arch/arm64/lib/crypto/sha256.c) | 0 |
15 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm64/lib/.gitignore b/arch/arm64/lib/.gitignore new file mode 100644 index 000000000000..647d7a922e68 --- /dev/null +++ b/arch/arm64/lib/.gitignore @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# This now-removed directory used to contain generated files. +/crypto/ diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile index 027bfa9689c6..d97e290619bc 100644 --- a/arch/arm64/lib/Makefile +++ b/arch/arm64/lib/Makefile @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 - -obj-y += crypto/ - lib-y := clear_user.o delay.o copy_from_user.o \ copy_to_user.o copy_page.o \ clear_page.o csum.o insn.o memchr.o memcpy.o \ diff --git a/arch/arm64/lib/crypto/.gitignore b/arch/arm64/lib/crypto/.gitignore deleted file mode 100644 index 12d74d8b03d0..000000000000 --- a/arch/arm64/lib/crypto/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -poly1305-core.S -sha256-core.S diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index e14bef8e87af..fdeb91bf0032 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -193,7 +193,7 @@ if ARM source "lib/crypto/arm/Kconfig" endif if ARM64 -source "arch/arm64/lib/crypto/Kconfig" +source "lib/crypto/arm64/Kconfig" endif if MIPS source "arch/mips/lib/crypto/Kconfig" diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 5f2b81f82a85..19e9880c5d5f 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -87,7 +87,7 @@ endif ifeq ($(CONFIG_ARM64),y) libsha512-y += arm64/sha512-core.o -$(obj)/arm64/sha512-core.S: $(src)/../../arch/arm64/lib/crypto/sha2-armv8.pl +$(obj)/arm64/sha512-core.S: $(src)/arm64/sha2-armv8.pl $(call cmd,perlasm_with_args) clean-files += arm64/sha512-core.S libsha512-$(CONFIG_KERNEL_MODE_NEON) += arm64/sha512-ce-core.o @@ -108,3 +108,4 @@ obj-$(CONFIG_CRYPTO_LIB_SM3) += libsm3.o libsm3-y := sm3.o obj-$(CONFIG_ARM) += arm/ +obj-$(CONFIG_ARM64) += arm64/ diff --git a/lib/crypto/arm64/.gitignore b/lib/crypto/arm64/.gitignore index 670a4d97b568..f6c4e8ef80da 100644 --- a/lib/crypto/arm64/.gitignore +++ b/lib/crypto/arm64/.gitignore @@ -1,2 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only +poly1305-core.S +sha256-core.S sha512-core.S diff --git a/arch/arm64/lib/crypto/Kconfig b/lib/crypto/arm64/Kconfig index 129a7685cb4c..129a7685cb4c 100644 --- a/arch/arm64/lib/crypto/Kconfig +++ b/lib/crypto/arm64/Kconfig diff --git a/arch/arm64/lib/crypto/Makefile b/lib/crypto/arm64/Makefile index 946c09903711..946c09903711 100644 --- a/arch/arm64/lib/crypto/Makefile +++ b/lib/crypto/arm64/Makefile diff --git a/arch/arm64/lib/crypto/chacha-neon-core.S b/lib/crypto/arm64/chacha-neon-core.S index 80079586ecc7..80079586ecc7 100644 --- a/arch/arm64/lib/crypto/chacha-neon-core.S +++ b/lib/crypto/arm64/chacha-neon-core.S diff --git a/arch/arm64/lib/crypto/chacha-neon-glue.c b/lib/crypto/arm64/chacha-neon-glue.c index d0188f974ca5..d0188f974ca5 100644 --- a/arch/arm64/lib/crypto/chacha-neon-glue.c +++ b/lib/crypto/arm64/chacha-neon-glue.c diff --git a/arch/arm64/lib/crypto/poly1305-armv8.pl b/lib/crypto/arm64/poly1305-armv8.pl index 22c9069c0650..22c9069c0650 100644 --- a/arch/arm64/lib/crypto/poly1305-armv8.pl +++ b/lib/crypto/arm64/poly1305-armv8.pl diff --git a/arch/arm64/lib/crypto/poly1305-glue.c b/lib/crypto/arm64/poly1305-glue.c index c9a74766785b..c9a74766785b 100644 --- a/arch/arm64/lib/crypto/poly1305-glue.c +++ b/lib/crypto/arm64/poly1305-glue.c diff --git a/arch/arm64/lib/crypto/sha2-armv8.pl b/lib/crypto/arm64/sha2-armv8.pl index 4aebd20c498b..4aebd20c498b 100644 --- a/arch/arm64/lib/crypto/sha2-armv8.pl +++ b/lib/crypto/arm64/sha2-armv8.pl diff --git a/arch/arm64/lib/crypto/sha256-ce.S b/lib/crypto/arm64/sha256-ce.S index f3e21c6d87d2..f3e21c6d87d2 100644 --- a/arch/arm64/lib/crypto/sha256-ce.S +++ b/lib/crypto/arm64/sha256-ce.S diff --git a/arch/arm64/lib/crypto/sha256.c b/lib/crypto/arm64/sha256.c index bcf7a3adc0c4..bcf7a3adc0c4 100644 --- a/arch/arm64/lib/crypto/sha256.c +++ b/lib/crypto/arm64/sha256.c |