diff options
| -rw-r--r-- | arch/arm/lib/.gitignore | 4 | ||||
| -rw-r--r-- | arch/arm/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/lib/crypto/.gitignore | 3 | ||||
| -rw-r--r-- | lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | lib/crypto/Makefile | 2 | ||||
| -rw-r--r-- | lib/crypto/arm/.gitignore | 2 | ||||
| -rw-r--r-- | lib/crypto/arm/Kconfig (renamed from arch/arm/lib/crypto/Kconfig) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/Makefile (renamed from arch/arm/lib/crypto/Makefile) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/blake2s-core.S (renamed from arch/arm/lib/crypto/blake2s-core.S) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/blake2s-glue.c (renamed from arch/arm/lib/crypto/blake2s-glue.c) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/chacha-glue.c (renamed from arch/arm/lib/crypto/chacha-glue.c) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/chacha-neon-core.S (renamed from arch/arm/lib/crypto/chacha-neon-core.S) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/chacha-scalar-core.S (renamed from arch/arm/lib/crypto/chacha-scalar-core.S) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/poly1305-armv4.pl (renamed from arch/arm/lib/crypto/poly1305-armv4.pl) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/poly1305-glue.c (renamed from arch/arm/lib/crypto/poly1305-glue.c) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/sha256-armv4.pl (renamed from arch/arm/lib/crypto/sha256-armv4.pl) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/sha256-ce.S (renamed from arch/arm/lib/crypto/sha256-ce.S) | 0 | ||||
| -rw-r--r-- | lib/crypto/arm/sha256.c (renamed from arch/arm/lib/crypto/sha256.c) | 0 |
18 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/lib/.gitignore b/arch/arm/lib/.gitignore new file mode 100644 index 000000000000..647d7a922e68 --- /dev/null +++ b/arch/arm/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/arm/lib/Makefile b/arch/arm/lib/Makefile index 91ea0e29107a..d05dd672bcd9 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -5,8 +5,6 @@ # Copyright (C) 1995-2000 Russell King # -obj-y += crypto/ - lib-y := changebit.o csumipv6.o csumpartial.o \ csumpartialcopy.o csumpartialcopyuser.o clearbit.o \ delay.o delay-loop.o findbit.o memchr.o memcpy.o \ diff --git a/arch/arm/lib/crypto/.gitignore b/arch/arm/lib/crypto/.gitignore deleted file mode 100644 index 12d74d8b03d0..000000000000 --- a/arch/arm/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 dce127a69f13..e14bef8e87af 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -190,7 +190,7 @@ config CRYPTO_LIB_SM3 if !KMSAN # avoid false positives from assembly if ARM -source "arch/arm/lib/crypto/Kconfig" +source "lib/crypto/arm/Kconfig" endif if ARM64 source "arch/arm64/lib/crypto/Kconfig" diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index aaf445a85384..5f2b81f82a85 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -106,3 +106,5 @@ obj-$(CONFIG_CRYPTO_SELFTESTS_FULL) += simd.o obj-$(CONFIG_CRYPTO_LIB_SM3) += libsm3.o libsm3-y := sm3.o + +obj-$(CONFIG_ARM) += arm/ diff --git a/lib/crypto/arm/.gitignore b/lib/crypto/arm/.gitignore index 670a4d97b568..f6c4e8ef80da 100644 --- a/lib/crypto/arm/.gitignore +++ b/lib/crypto/arm/.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/arm/lib/crypto/Kconfig b/lib/crypto/arm/Kconfig index d1ad664f0c67..d1ad664f0c67 100644 --- a/arch/arm/lib/crypto/Kconfig +++ b/lib/crypto/arm/Kconfig diff --git a/arch/arm/lib/crypto/Makefile b/lib/crypto/arm/Makefile index 431f77c3ff6f..431f77c3ff6f 100644 --- a/arch/arm/lib/crypto/Makefile +++ b/lib/crypto/arm/Makefile diff --git a/arch/arm/lib/crypto/blake2s-core.S b/lib/crypto/arm/blake2s-core.S index df40e46601f1..df40e46601f1 100644 --- a/arch/arm/lib/crypto/blake2s-core.S +++ b/lib/crypto/arm/blake2s-core.S diff --git a/arch/arm/lib/crypto/blake2s-glue.c b/lib/crypto/arm/blake2s-glue.c index 0238a70d9581..0238a70d9581 100644 --- a/arch/arm/lib/crypto/blake2s-glue.c +++ b/lib/crypto/arm/blake2s-glue.c diff --git a/arch/arm/lib/crypto/chacha-glue.c b/lib/crypto/arm/chacha-glue.c index 88ec96415283..88ec96415283 100644 --- a/arch/arm/lib/crypto/chacha-glue.c +++ b/lib/crypto/arm/chacha-glue.c diff --git a/arch/arm/lib/crypto/chacha-neon-core.S b/lib/crypto/arm/chacha-neon-core.S index ddd62b6294a5..ddd62b6294a5 100644 --- a/arch/arm/lib/crypto/chacha-neon-core.S +++ b/lib/crypto/arm/chacha-neon-core.S diff --git a/arch/arm/lib/crypto/chacha-scalar-core.S b/lib/crypto/arm/chacha-scalar-core.S index 4951df05c158..4951df05c158 100644 --- a/arch/arm/lib/crypto/chacha-scalar-core.S +++ b/lib/crypto/arm/chacha-scalar-core.S diff --git a/arch/arm/lib/crypto/poly1305-armv4.pl b/lib/crypto/arm/poly1305-armv4.pl index d57c6e2fc84a..d57c6e2fc84a 100644 --- a/arch/arm/lib/crypto/poly1305-armv4.pl +++ b/lib/crypto/arm/poly1305-armv4.pl diff --git a/arch/arm/lib/crypto/poly1305-glue.c b/lib/crypto/arm/poly1305-glue.c index 2603b0771f2c..2603b0771f2c 100644 --- a/arch/arm/lib/crypto/poly1305-glue.c +++ b/lib/crypto/arm/poly1305-glue.c diff --git a/arch/arm/lib/crypto/sha256-armv4.pl b/lib/crypto/arm/sha256-armv4.pl index 8122db7fd599..8122db7fd599 100644 --- a/arch/arm/lib/crypto/sha256-armv4.pl +++ b/lib/crypto/arm/sha256-armv4.pl diff --git a/arch/arm/lib/crypto/sha256-ce.S b/lib/crypto/arm/sha256-ce.S index ac2c9b01b22d..ac2c9b01b22d 100644 --- a/arch/arm/lib/crypto/sha256-ce.S +++ b/lib/crypto/arm/sha256-ce.S diff --git a/arch/arm/lib/crypto/sha256.c b/lib/crypto/arm/sha256.c index 109192e54b0f..109192e54b0f 100644 --- a/arch/arm/lib/crypto/sha256.c +++ b/lib/crypto/arm/sha256.c |