From 464451d9ab824c2ed62f7da33f0a965f562714c8 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Fri, 26 Feb 2021 14:35:24 -0800 Subject: [PATCH] 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 Signed-off-by: Ilya Lipnitskiy Reviewed-by: Jason A. Donenfeld --- package/kernel/linux/modules/crypto.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index a64b91a8fe7..cbaa8d3ce58 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)=\ -- 2.30.2