修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/arch/arm/crypto/Makefile
..
..
@@ -10,38 +10,19 @@
10
10
 obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o
11
11
 obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o
12
12
 obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += blake2s-arm.o
13
+obj-$(if $(CONFIG_CRYPTO_BLAKE2S_ARM),y) += libblake2s-arm.o
13
14
 obj-$(CONFIG_CRYPTO_BLAKE2B_NEON) += blake2b-neon.o
14
15
 obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o
15
16
 obj-$(CONFIG_CRYPTO_POLY1305_ARM) += poly1305-arm.o
16
17
 obj-$(CONFIG_CRYPTO_NHPOLY1305_NEON) += nhpoly1305-neon.o
17
18
 obj-$(CONFIG_CRYPTO_CURVE25519_NEON) += curve25519-neon.o
18
19
 
19
-ce-obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o
20
-ce-obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o
21
-ce-obj-$(CONFIG_CRYPTO_SHA2_ARM_CE) += sha2-arm-ce.o
22
-ce-obj-$(CONFIG_CRYPTO_GHASH_ARM_CE) += ghash-arm-ce.o
23
-ce-obj-$(CONFIG_CRYPTO_CRCT10DIF_ARM_CE) += crct10dif-arm-ce.o
24
-crc-obj-$(CONFIG_CRYPTO_CRC32_ARM_CE) += crc32-arm-ce.o
25
-
26
-ifneq ($(crc-obj-y)$(crc-obj-m),)
27
-ifeq ($(call as-instr,.arch armv8-a\n.arch_extension crc,y,n),y)
28
-ce-obj-y += $(crc-obj-y)
29
-ce-obj-m += $(crc-obj-m)
30
-else
31
-$(warning These CRC Extensions modules need binutils 2.23 or higher)
32
-$(warning $(crc-obj-y) $(crc-obj-m))
33
-endif
34
-endif
35
-
36
-ifneq ($(ce-obj-y)$(ce-obj-m),)
37
-ifeq ($(call as-instr,.fpu crypto-neon-fp-armv8,y,n),y)
38
-obj-y += $(ce-obj-y)
39
-obj-m += $(ce-obj-m)
40
-else
41
-$(warning These ARMv8 Crypto Extensions modules need binutils 2.23 or higher)
42
-$(warning $(ce-obj-y) $(ce-obj-m))
43
-endif
44
-endif
20
+obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o
21
+obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o
22
+obj-$(CONFIG_CRYPTO_SHA2_ARM_CE) += sha2-arm-ce.o
23
+obj-$(CONFIG_CRYPTO_GHASH_ARM_CE) += ghash-arm-ce.o
24
+obj-$(CONFIG_CRYPTO_CRCT10DIF_ARM_CE) += crct10dif-arm-ce.o
25
+obj-$(CONFIG_CRYPTO_CRC32_ARM_CE) += crc32-arm-ce.o
45
26
 
46
27
 aes-arm-y	:= aes-cipher-core.o aes-cipher-glue.o
47
28
 aes-arm-bs-y	:= aes-neonbs-core.o aes-neonbs-glue.o
..
..
@@ -51,7 +32,8 @@
51
32
 sha256-arm-y	:= sha256-core.o sha256_glue.o $(sha256-arm-neon-y)
52
33
 sha512-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha512-neon-glue.o
53
34
 sha512-arm-y	:= sha512-core.o sha512-glue.o $(sha512-arm-neon-y)
54
-blake2s-arm-y   := blake2s-core.o blake2s-glue.o
35
+blake2s-arm-y   := blake2s-shash.o
36
+libblake2s-arm-y:= blake2s-core.o blake2s-glue.o
55
37
 blake2b-neon-y  := blake2b-neon-core.o blake2b-neon-glue.o
56
38
 sha1-arm-ce-y	:= sha1-ce-core.o sha1-ce-glue.o
57
39
 sha2-arm-ce-y	:= sha2-ce-core.o sha2-ce-glue.o
..
..
@@ -79,7 +61,7 @@
79
61
 	$(call cmd,perl)
80
62
 endif
81
63
 
82
-targets += poly1305-core.S sha256-core.S sha512-core.S
64
+clean-files += poly1305-core.S sha256-core.S sha512-core.S
83
65
 
84
66
 # massage the perlasm code a bit so we only get the NEON routine if we need it
85
67
 poly1305-aflags-$(CONFIG_CPU_V7) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=5