diff --git a/package/kernel/mtk-eip93/Makefile b/package/kernel/mtk-eip93/Makefile index 3ed97e2a0a..f1fcf176fc 100644 --- a/package/kernel/mtk-eip93/Makefile +++ b/package/kernel/mtk-eip93/Makefile @@ -13,10 +13,10 @@ PKG_RELEASE:=1.3 PKG_SOURCE_URL:=https://github.com/vschagen/mtk-eip93.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=bb5fd1c88a8a74de06b70c281bceeb14d0d960ef -PKG_MIRROR_HASH:=cb114b29f7e06e817341adb9127c4d053592be53356a64d932cf7ba418606260 +PKG_SOURCE_VERSION:=ca08387bf8352652129019bb19e2423ab313d5cb +PKG_MIRROR_HASH:=4505ee2a175a6cf77a1a3b4fa7bf188da8f8b47894e5afa62c8cb008fbfa15ed -MAKE_PATH:=src +MAKE_PATH:=crypto/mtk-eip93 include $(INCLUDE_DIR)/package.mk @@ -31,9 +31,8 @@ define KernelPackage/crypto-hw-eip93 +kmod-crypto-md5 \ +kmod-crypto-sha1 \ +kmod-crypto-sha256 - KCONFIG:= TITLE:=MTK EIP93 crypto module. - FILES:=$(PKG_BUILD_DIR)/src/crypto-hw-eip93.ko + FILES:=$(PKG_BUILD_DIR)/crypto/mtk-eip93/crypto-hw-eip93.ko AUTOLOAD:=$(call AutoProbe,crypto-hw-eip93) endef @@ -44,9 +43,22 @@ It enables DES/3DES/AES ECB/CBC/CTR and IPSEC offload with authenc(hmac(sha1/sha256), aes/cbc/rfc3686) endef +PKG_EXTRA_KCONFIG:= \ + CONFIG_CRYPTO_DEV_EIP93=m \ + CONFIG_CRYPTO_DEV_EIP93_AEAD=y \ + CONFIG_CRYPTO_DEV_EIP93_AES=y \ + CONFIG_CRYPTO_DEV_EIP93_DES=y \ + CONFIG_CRYPTO_DEV_EIP93_HMAC=y \ + CONFIG_CRYPTO_DEV_EIP93_SKCIPHER=y + +PKG_EXTRA_CFLAGS:= \ + $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) + MAKE_OPTS:= \ $(KERNEL_MAKE_FLAGS) \ - M="$(PKG_BUILD_DIR)/src" + M="$(PKG_BUILD_DIR)/crypto/mtk-eip93" \ + $(PKG_EXTRA_KCONFIG) \ + EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ diff --git a/package/kernel/mtk-eip93/patches/100-fix-build-on-kernel-5.4.patch b/package/kernel/mtk-eip93/patches/100-fix-build-on-kernel-5.4.patch new file mode 100644 index 0000000000..8f9e0b93b7 --- /dev/null +++ b/package/kernel/mtk-eip93/patches/100-fix-build-on-kernel-5.4.patch @@ -0,0 +1,48 @@ +--- a/crypto/mtk-eip93/eip93-aead.c ++++ b/crypto/mtk-eip93/eip93-aead.c +@@ -13,8 +13,6 @@ + #include + #include + #include +-#include +-#include + + #if IS_ENABLED(CONFIG_CRYPTO_DEV_EIP93_DES) + #include +@@ -22,6 +20,14 @@ + + #include + #include ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) ++#include ++#else ++#include ++#include ++#endif + + #include "eip93-aead.h" + #include "eip93-cipher.h" +--- a/crypto/mtk-eip93/eip93-common.c ++++ b/crypto/mtk-eip93/eip93-common.c +@@ -8,11 +8,17 @@ + #include + #include + #include +-#include +-#include + #include + #include + #include ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) ++#include ++#else ++#include ++#include ++#endif + + #include "eip93-cipher.h" + #include "eip93-common.h"