aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2023-04-08 10:29:06 +0200
committerPetr Štetiar <ynezz@true.cz>2023-04-10 07:36:33 +0200
commit8a554a287811eaf43f375b5875c87a75d1c9bcb0 (patch)
tree0c84f63c334e1d6ec680ca1b5b87183f822e5ea4 /package
parent32f134fbdf027afc342caea17200728033747333 (diff)
downloadupstream-8a554a287811eaf43f375b5875c87a75d1c9bcb0.tar.gz
upstream-8a554a287811eaf43f375b5875c87a75d1c9bcb0.tar.bz2
upstream-8a554a287811eaf43f375b5875c87a75d1c9bcb0.zip
kernel: crypto: fix architecture specific modules
While tracking one bug report related to wrong package dependencies I've noticed, that a bunch of the crypto modules are actually not architecture specific, but either board/subtarget (x86/64) or board (mpc85xx) specific. So lets fix it, by making those modules architecture specific: x86/64 -> x86_64 mpc85xx -> powerpc Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'package')
-rw-r--r--package/kernel/linux/modules/crypto.mk42
1 files changed, 36 insertions, 6 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index 83048e50d3..04499f5f5f 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -541,7 +541,7 @@ define KernelPackage/crypto-lib-curve25519/config
imply PACKAGE_kmod-crypto-kpp
endef
-define KernelPackage/crypto-lib-curve25519/x86/64
+define KernelPackage/crypto-lib-curve25519/x86_64
KCONFIG+=CONFIG_CRYPTO_CURVE25519_X86
FILES+=$(LINUX_DIR)/arch/x86/crypto/curve25519-x86_64.ko
endef
@@ -556,6 +556,11 @@ ifeq ($(ARCH)-$(CONFIG_KERNEL_MODE_NEON),arm-y)
$(KernelPackage/crypto-lib-curve25519/arm-neon)
endif
+ifdef KernelPackage/crypto-lib-curve25519/$(ARCH)
+ KernelPackage/crypto-lib-curve25519/$(CRYPTO_TARGET)=\
+ $(KernelPackage/crypto-lib-curve25519/$(ARCH))
+endif
+
$(eval $(call KernelPackage,crypto-lib-curve25519))
@@ -646,11 +651,16 @@ define KernelPackage/crypto-md5/octeon
AUTOLOAD+=$(call AutoLoad,09,octeon-md5)
endef
-define KernelPackage/crypto-md5/mpc85xx
+define KernelPackage/crypto-md5/powerpc
FILES+=$(LINUX_DIR)/arch/powerpc/crypto/md5-ppc.ko
AUTOLOAD+=$(call AutoLoad,09,md5-ppc)
endef
+ifdef KernelPackage/crypto-md5/$(ARCH)
+ KernelPackage/crypto-md5/$(CRYPTO_TARGET)=\
+ $(KernelPackage/crypto-md5/$(ARCH))
+endif
+
$(eval $(call KernelPackage,crypto-md5))
@@ -735,7 +745,7 @@ ifndef CONFIG_TARGET_x86_64
endef
endif
-define KernelPackage/crypto-misc/x86/64
+define KernelPackage/crypto-misc/x86_64
FILES+= \
$(LINUX_DIR)/arch/x86/crypto/camellia-x86_64.ko \
$(LINUX_DIR)/arch/x86/crypto/blowfish-x86_64.ko \
@@ -755,6 +765,11 @@ define KernelPackage/crypto-misc/x86/64
twofish-avx-x86_64 blowfish-x86_64 serpent-avx-x86_64 serpent-avx2)
endef
+ifdef KernelPackage/crypto-misc/$(ARCH)
+ KernelPackage/crypto-misc/$(CRYPTO_TARGET)=\
+ $(KernelPackage/crypto-misc/$(ARCH))
+endif
+
$(eval $(call KernelPackage,crypto-misc))
@@ -884,11 +899,16 @@ define KernelPackage/crypto-sha1/mpc85xx
AUTOLOAD+=$(call AutoLoad,09,sha1-ppc-spe)
endef
-define KernelPackage/crypto-sha1/x86/64
+define KernelPackage/crypto-sha1/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha1-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha1-ssse3)
endef
+ifdef KernelPackage/crypto-sha1/$(ARCH)
+ KernelPackage/crypto-sha1/$(CRYPTO_TARGET)=\
+ $(KernelPackage/crypto-sha1/$(ARCH))
+endif
+
$(eval $(call KernelPackage,crypto-sha1))
@@ -917,11 +937,16 @@ define KernelPackage/crypto-sha256/mpc85xx
AUTOLOAD+=$(call AutoLoad,09,sha256-ppc-spe)
endef
-define KernelPackage/crypto-sha256/x86/64
+define KernelPackage/crypto-sha256/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha256-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha256-ssse3)
endef
+ifdef KernelPackage/crypto-sha256/$(ARCH)
+ KernelPackage/crypto-sha256/$(CRYPTO_TARGET)=\
+ $(KernelPackage/crypto-sha256/$(ARCH))
+endif
+
$(eval $(call KernelPackage,crypto-sha256))
@@ -954,11 +979,16 @@ endef
KernelPackage/crypto-sha512/tegra=$(KernelPackage/crypto-sha512/arm)
-define KernelPackage/crypto-sha512/x86/64
+define KernelPackage/crypto-sha512/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha512-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha512-ssse3)
endef
+ifdef KernelPackage/crypto-sha512/$(ARCH)
+ KernelPackage/crypto-sha512/$(CRYPTO_TARGET)=\
+ $(KernelPackage/crypto-sha512/$(ARCH))
+endif
+
$(eval $(call KernelPackage,crypto-sha512))