aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux/modules
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-26 14:35:24 -0800
committerDavid Bauer <mail@david-bauer.net>2021-02-27 10:14:23 +0100
commit464451d9ab824c2ed62f7da33f0a965f562714c8 (patch)
tree06d73903a077488bfa43f00e76d2e1e3a801d452 /package/kernel/linux/modules
parentcbcac4fde8ba476ac20ec14bfa6a3c3d9a8a8c02 (diff)
downloadupstream-464451d9ab824c2ed62f7da33f0a965f562714c8.tar.gz
upstream-464451d9ab824c2ed62f7da33f0a965f562714c8.tar.bz2
upstream-464451d9ab824c2ed62f7da33f0a965f562714c8.zip
kernel: no chacha-mips.ko on mips32 r1 targets
CHACHA_MIPS depends on CPU_MIPS32_R2. Therefore, kmod-crypto-lib-chacha20 should not contain chacha-mips.ko on MIPS32 R1 targets. Enforce that in the target-specific definition. Fixes bcm47xx, bcm63xx, lantiq/ase, ath25 builds. Fixes: 06351f1 ("kernel: migrate wireguard into the kernel tree") Cc: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'package/kernel/linux/modules')
-rw-r--r--package/kernel/linux/modules/crypto.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index a64b91a8fe..cbaa8d3ce5 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -485,12 +485,15 @@ define KernelPackage/crypto-lib-chacha20/aarch64
FILES+=$(LINUX_DIR)/arch/arm64/crypto/chacha-neon.ko
endef
-define KernelPackage/crypto-lib-chacha20/mips
+define KernelPackage/crypto-lib-chacha20/mips32r2
KCONFIG+=CONFIG_CRYPTO_CHACHA_MIPS
FILES:=$(LINUX_DIR)/arch/mips/crypto/chacha-mips.ko
endef
-KernelPackage/crypto-lib-chacha20/mipsel=$(KernelPackage/crypto-lib-chacha20/mips)
+ifeq ($(CONFIG_CPU_MIPS32_R2),y)
+ KernelPackage/crypto-lib-chacha20/$(ARCH)=\
+ $(KernelPackage/crypto-lib-chacha20/mips32r2)
+endif
ifdef KernelPackage/crypto-lib-chacha20/$(ARCH)
KernelPackage/crypto-lib-chacha20/$(CRYPTO_TARGET)=\