domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: crypto: fix architecture specific modules

Browse Source 
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>
This commit is contained in:
Petr Štetiar
2023-04-08 10:29:06 +02:00
parent 32f134fbdf
commit 8a554a2878
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
package/kernel/linux/modules/crypto.mk
View File

@@ -541,7 +541,7 @@ define KernelPackage/crypto-lib-curve25519/config
imply PACKAGE_kmod-crypto-kpp imply PACKAGE_kmod-crypto-kpp
endef endef
define KernelPackage/crypto-lib-curve25519/x86/64 define KernelPackage/crypto-lib-curve25519/x86_64
KCONFIG+=CONFIG_CRYPTO_CURVE25519_X86 KCONFIG+=CONFIG_CRYPTO_CURVE25519_X86
FILES+=$(LINUX_DIR)/arch/x86/crypto/curve25519-x86_64.ko FILES+=$(LINUX_DIR)/arch/x86/crypto/curve25519-x86_64.ko
endef endef
@@ -556,6 +556,11 @@ ifeq ($(ARCH)-$(CONFIG_KERNEL_MODE_NEON),arm-y)
$(KernelPackage/crypto-lib-curve25519/arm-neon) $(KernelPackage/crypto-lib-curve25519/arm-neon)
endif 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)) $(eval $(call KernelPackage,crypto-lib-curve25519))
@@ -646,11 +651,16 @@ define KernelPackage/crypto-md5/octeon
AUTOLOAD+=$(call AutoLoad,09,octeon-md5) AUTOLOAD+=$(call AutoLoad,09,octeon-md5)
endef endef
define KernelPackage/crypto-md5/mpc85xx define KernelPackage/crypto-md5/powerpc
FILES+=$(LINUX_DIR)/arch/powerpc/crypto/md5-ppc.ko FILES+=$(LINUX_DIR)/arch/powerpc/crypto/md5-ppc.ko
AUTOLOAD+=$(call AutoLoad,09,md5-ppc) AUTOLOAD+=$(call AutoLoad,09,md5-ppc)
endef endef
ifdef KernelPackage/crypto-md5/$(ARCH)
KernelPackage/crypto-md5/$(CRYPTO_TARGET)=\
$(KernelPackage/crypto-md5/$(ARCH))
endif
$(eval $(call KernelPackage,crypto-md5)) $(eval $(call KernelPackage,crypto-md5))
@@ -735,7 +745,7 @@ ifndef CONFIG_TARGET_x86_64
endef endef
endif endif
define KernelPackage/crypto-misc/x86/64 define KernelPackage/crypto-misc/x86_64
FILES+= \ FILES+= \
$(LINUX_DIR)/arch/x86/crypto/camellia-x86_64.ko \ $(LINUX_DIR)/arch/x86/crypto/camellia-x86_64.ko \
$(LINUX_DIR)/arch/x86/crypto/blowfish-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) twofish-avx-x86_64 blowfish-x86_64 serpent-avx-x86_64 serpent-avx2)
endef endef
ifdef KernelPackage/crypto-misc/$(ARCH)
KernelPackage/crypto-misc/$(CRYPTO_TARGET)=\
$(KernelPackage/crypto-misc/$(ARCH))
endif
$(eval $(call KernelPackage,crypto-misc)) $(eval $(call KernelPackage,crypto-misc))
@@ -884,11 +899,16 @@ define KernelPackage/crypto-sha1/mpc85xx
AUTOLOAD+=$(call AutoLoad,09,sha1-ppc-spe) AUTOLOAD+=$(call AutoLoad,09,sha1-ppc-spe)
endef endef
define KernelPackage/crypto-sha1/x86/64 define KernelPackage/crypto-sha1/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha1-ssse3.ko FILES+=$(LINUX_DIR)/arch/x86/crypto/sha1-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha1-ssse3) AUTOLOAD+=$(call AutoLoad,09,sha1-ssse3)
endef endef
ifdef KernelPackage/crypto-sha1/$(ARCH)
KernelPackage/crypto-sha1/$(CRYPTO_TARGET)=\
$(KernelPackage/crypto-sha1/$(ARCH))
endif
$(eval $(call KernelPackage,crypto-sha1)) $(eval $(call KernelPackage,crypto-sha1))
@@ -917,11 +937,16 @@ define KernelPackage/crypto-sha256/mpc85xx
AUTOLOAD+=$(call AutoLoad,09,sha256-ppc-spe) AUTOLOAD+=$(call AutoLoad,09,sha256-ppc-spe)
endef endef
define KernelPackage/crypto-sha256/x86/64 define KernelPackage/crypto-sha256/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha256-ssse3.ko FILES+=$(LINUX_DIR)/arch/x86/crypto/sha256-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha256-ssse3) AUTOLOAD+=$(call AutoLoad,09,sha256-ssse3)
endef endef
ifdef KernelPackage/crypto-sha256/$(ARCH)
KernelPackage/crypto-sha256/$(CRYPTO_TARGET)=\
$(KernelPackage/crypto-sha256/$(ARCH))
endif
$(eval $(call KernelPackage,crypto-sha256)) $(eval $(call KernelPackage,crypto-sha256))
@@ -954,11 +979,16 @@ endef
KernelPackage/crypto-sha512/tegra=$(KernelPackage/crypto-sha512/arm) 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 FILES+=$(LINUX_DIR)/arch/x86/crypto/sha512-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha512-ssse3) AUTOLOAD+=$(call AutoLoad,09,sha512-ssse3)
endef endef
ifdef KernelPackage/crypto-sha512/$(ARCH)
KernelPackage/crypto-sha512/$(CRYPTO_TARGET)=\
$(KernelPackage/crypto-sha512/$(ARCH))
endif
$(eval $(call KernelPackage,crypto-sha512)) $(eval $(call KernelPackage,crypto-sha512))