From 632a7b29972f0176fb621090e2bbab46a710a24c Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 29 Feb 2020 13:57:09 +0100 Subject: [PATCH] mvebu: fix build regression due to neon-asm ghash module This patch fixes the regression caused by adding the NEON variant of the ghash as the default ghash package package: > ERROR: module '[...]/arch/arm/crypto/ghash-arm-ce.ko' is missing. > modules/crypto.mk:286: recipe for target > '[...]/kmod-crypto-ghash_4.19.106-1_aarch64_cortex-a53.ipk' failed This patch limits the scope to the ARM32/cortexa9 target of mvebu. Fixes: 285df63efc70 ("kernel: build neon-asm version of ghash module") Signed-off-by: Christian Lamparter --- package/kernel/linux/modules/crypto.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index c71cef4452..9001721792 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -281,7 +281,7 @@ endef KernelPackage/crypto-ghash/imx6=$(KernelPackage/crypto-ghash/arm-ce) KernelPackage/crypto-ghash/ipq40xx=$(KernelPackage/crypto-ghash/arm-ce) -KernelPackage/crypto-ghash/mvebu=$(KernelPackage/crypto-ghash/arm-ce) +KernelPackage/crypto-ghash/mvebu/cortexa9=$(KernelPackage/crypto-ghash/arm-ce) $(eval $(call KernelPackage,crypto-ghash)) @@ -703,10 +703,8 @@ define KernelPackage/crypto-sha1/arm-neon endef KernelPackage/crypto-sha1/imx6=$(KernelPackage/crypto-sha1/arm-neon) - KernelPackage/crypto-sha1/ipq40xx=$(KernelPackage/crypto-sha1/arm-neon) - -KernelPackage/crypto-sha1/mvebu=$(KernelPackage/crypto-sha1/arm-neon) +KernelPackage/crypto-sha1/mvebu/cortexa9=$(KernelPackage/crypto-sha1/arm-neon) define KernelPackage/crypto-sha1/octeon FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha1.ko @@ -769,10 +767,8 @@ define KernelPackage/crypto-sha512/arm endef KernelPackage/crypto-sha512/imx6=$(KernelPackage/crypto-sha512/arm) - KernelPackage/crypto-sha512/ipq40xx=$(KernelPackage/crypto-sha512/arm) - -KernelPackage/crypto-sha512/mvebu=$(KernelPackage/crypto-sha512/arm) +KernelPackage/crypto-sha512/mvebu/cortexa9=$(KernelPackage/crypto-sha512/arm) define KernelPackage/crypto-sha512/octeon FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha512.ko -- 2.30.2