mpc85xx: enable the crypto acceleration driver in the kernel config instead of packag...

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index 1b4cf3d80db54c84699ff0cff698a655c2b89e30..0f8305285de0439a3ba7e12e06ddac5be982e2d0 100644 (file)
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -158,32 +158,6 @@ endef
 $(eval $(call KernelPackage,crypto-seqiv))
 
 
 $(eval $(call KernelPackage,crypto-seqiv))
 
 

-define KernelPackage/crypto-hw-caam
-  TITLE:=Freescale CAAM driver (SEC4)
-  DEPENDS:=@TARGET_mpc85xx +kmod-crypto-aead +kmod-crypto-authenc +kmod-crypto-hash +kmod-random-core
-  KCONFIG:= \
-       CONFIG_CRYPTO_HW=y \
-       CONFIG_CRYPTO_DEV_FSL_CAAM \
-       CONFIG_CRYPTO_DEV_FSL_CAAM_JR \
-       CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API \
-       CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API \
-       CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API \
-       CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 \
-       CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=n \
-       CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG=n
-  FILES:= \
-       $(LINUX_DIR)/drivers/crypto/caam/caam.ko \
-       $(LINUX_DIR)/drivers/crypto/caam/caamalg.ko \
-       $(LINUX_DIR)/drivers/crypto/caam/caamhash.ko \
-       $(LINUX_DIR)/drivers/crypto/caam/caam_jr.ko \
-       $(LINUX_DIR)/drivers/crypto/caam/caamrng.ko
-  AUTOLOAD:=$(call AutoLoad,09,caam caamalg caamhash caam_jr caamrng)
-  $(call AddDepends/crypto)
-endef
-
-$(eval $(call KernelPackage,crypto-hw-caam))
-
-

 define KernelPackage/crypto-hw-talitos
   TITLE:=Freescale integrated security engine (SEC) driver
   DEPENDS:=+kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc
 define KernelPackage/crypto-hw-talitos
   TITLE:=Freescale integrated security engine (SEC) driver
   DEPENDS:=+kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc

diff --git a/target/linux/mpc85xx/config-4.4 b/target/linux/mpc85xx/config-4.4
index 06b88705d9045a0b2207464bba86b0d9cd47b5d7..1afedf0f796a8fe2c8f32d12d40b24ccddc897c0 100644 (file)
--- a/target/linux/mpc85xx/config-4.4
+++ b/target/linux/mpc85xx/config-4.4
@@ -39,8 +39,29 @@ CONFIG_CMDLINE_BOOL=y
 # CONFIG_CORENET_GENERIC is not set
 # CONFIG_CPM2 is not set
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CORENET_GENERIC is not set
 # CONFIG_CPM2 is not set
 CONFIG_CPU_BIG_ENDIAN=y

+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y

 # CONFIG_CRYPTO_AES_PPC_SPE is not set
 # CONFIG_CRYPTO_AES_PPC_SPE is not set

+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set
+# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM_LE is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y

 # CONFIG_CRYPTO_MD5_PPC is not set
 # CONFIG_CRYPTO_MD5_PPC is not set

+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_RNG=y

 CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SHA1_PPC is not set
 # CONFIG_CRYPTO_SHA1_PPC_SPE is not set
 CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SHA1_PPC is not set
 # CONFIG_CRYPTO_SHA1_PPC_SPE is not set


@@ -129,6 +150,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y

+CONFIG_HW_RANDOM=y

 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y


@@ -281,7 +303,6 @@ CONFIG_SRCU=y
 # CONFIG_STRICT_MM_TYPECHECKS is not set
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_STX_GP3 is not set
 # CONFIG_STRICT_MM_TYPECHECKS is not set
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_STX_GP3 is not set

-# CONFIG_SUNXI_SRAM is not set

 CONFIG_SWCONFIG=y
 CONFIG_SWIOTLB=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SWCONFIG=y
 CONFIG_SWIOTLB=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y


@@ -301,6 +322,7 @@ CONFIG_UCC_GETH=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VDSO32=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VDSO32=y
 CONFIG_VM_EVENT_COUNTERS=y

+CONFIG_WATCHDOG_CORE=y

 CONFIG_WORD_SIZE=32
 # CONFIG_XES_MPC85xx is not set
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_WORD_SIZE=32
 # CONFIG_XES_MPC85xx is not set
 CONFIG_XZ_DEC_BCJ=y