kernel: crypto: limit crypto-hw-hifn-795x to devices with pci support

[openwrt/openwrt.git] / package / kernel / linux / modules / lib.mk

diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index 3e5a12e926727446acf9743468dbdbb377093b8b..9a341932bdeb3c9816b82eeeecc7114f24615fcc 100644 (file)
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -101,17 +101,17 @@ $(eval $(call KernelPackage,lib-crc32c))
 define KernelPackage/lib-lzo
   SUBMENU:=$(LIB_MENU)
   TITLE:=LZO support
-  DEPENDS:=+!LINUX_4_9:kmod-crypto-acompress
+  DEPENDS:=+kmod-crypto-acompress
   KCONFIG:= \
-       CONFIG_CRYPTO_LZO@ge4.9 \
+       CONFIG_CRYPTO_LZO \
        CONFIG_LZO_COMPRESS \
        CONFIG_LZO_DECOMPRESS
   HIDDEN:=1
   FILES:= \
-       $(LINUX_DIR)/crypto/lzo.ko@ge4.9 \
+       $(LINUX_DIR)/crypto/lzo.ko \
        $(LINUX_DIR)/lib/lzo/lzo_compress.ko \
        $(LINUX_DIR)/lib/lzo/lzo_decompress.ko
-  AUTOLOAD:=$(call AutoProbe,lzo@ge4.9 lzo_compress lzo_decompress)
+  AUTOLOAD:=$(call AutoProbe,lzo lzo_compress lzo_decompress)
 endef
 
 define KernelPackage/lib-lzo/description
@@ -124,16 +124,18 @@ $(eval $(call KernelPackage,lib-lzo))
 define KernelPackage/lib-zstd
   SUBMENU:=$(LIB_MENU)
   TITLE:=ZSTD support
+  DEPENDS:=+kmod-crypto-acompress
   KCONFIG:= \
+       CONFIG_CRYPTO_ZSTD \
        CONFIG_ZSTD_COMPRESS \
        CONFIG_ZSTD_DECOMPRESS \
        CONFIG_XXHASH
-  HIDDEN:=1
   FILES:= \
+       $(LINUX_DIR)/crypto/zstd.ko \
        $(LINUX_DIR)/lib/xxhash.ko \
        $(LINUX_DIR)/lib/zstd/zstd_compress.ko \
        $(LINUX_DIR)/lib/zstd/zstd_decompress.ko
-  AUTOLOAD:=$(call AutoProbe,xxhash zstd_compress zstd_decompress)
+  AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress)
 endef
 
 define KernelPackage/lib-zstd/description
@@ -146,17 +148,16 @@ $(eval $(call KernelPackage,lib-zstd))
 define KernelPackage/lib-lz4
   SUBMENU:=$(LIB_MENU)
   TITLE:=LZ4 support
-  DEPENDS:=+!LINUX_4_9:kmod-crypto-acompress
-  HIDDEN:=1
+  DEPENDS:=+kmod-crypto-acompress
   KCONFIG:= \
-       CONFIG_CRYPTO_LZ4@ge4.9 \
+       CONFIG_CRYPTO_LZ4 \
        CONFIG_LZ4_COMPRESS \
        CONFIG_LZ4_DECOMPRESS
   FILES:= \
-       $(LINUX_DIR)/crypto/lz4.ko@ge4.9 \
+       $(LINUX_DIR)/crypto/lz4.ko \
        $(LINUX_DIR)/lib/lz4/lz4_compress.ko \
        $(LINUX_DIR)/lib/lz4/lz4_decompress.ko
-  AUTOLOAD:=$(call AutoProbe,lz4@ge4.9 lz4_compress lz4_decompress)
+  AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress lz4_decompress)
 endef
 
 define KernelPackage/lib-lz4/description
@@ -187,10 +188,10 @@ define KernelPackage/lib-xor
   TITLE:=XOR blocks algorithm support
   HIDDEN:=1
   KCONFIG:=CONFIG_XOR_BLOCKS
-ifneq ($(wildcard $(LINUX_DIR)/arch/arm/lib/xor-neon.ko),)
+ifneq ($(wildcard $(LINUX_DIR)/arch/$(LINUX_KARCH)/lib/xor-neon.ko),)
   FILES:= \
     $(LINUX_DIR)/crypto/xor.ko \
-    $(LINUX_DIR)/arch/arm/lib/xor-neon.ko
+    $(LINUX_DIR)/arch/$(LINUX_KARCH)/lib/xor-neon.ko
   AUTOLOAD:=$(call AutoProbe,xor-neon xor)
 else
   FILES:=$(LINUX_DIR)/crypto/xor.ko
@@ -251,7 +252,7 @@ define KernelPackage/lib-cordic
   SUBMENU:=$(LIB_MENU)
   TITLE:=Cordic function support
   KCONFIG:=CONFIG_CORDIC
-  FILES:=$(LINUX_DIR)/lib/cordic.ko
+  FILES:=$(LINUX_DIR)/lib/math/cordic.ko
   AUTOLOAD:=$(call AutoProbe,cordic)
 endef