summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDan Douglass <dan.douglass@freescale.com>2016-01-20 14:34:17 -0600
committerDan Douglass <dan.douglass@freescale.com>2016-01-20 14:36:00 -0600
commita46729fc1d1756dc5a1a961f02e2ee7221e5cdd3 (patch)
tree6b1f47ba0557f660c6474abc6d9c49f2a972d3f0 /arch
parent9769b44527f7a0995c2fde2bd236d705ac630b86 (diff)
MLK-12305 Enable CAAM in kernel version 4.1 imx_v7_defconfig
Enabled CAAM in imx_v7_defconfig. Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/imx_v7_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index b0f66091397b..40e35b997ef8 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -422,6 +422,10 @@ CONFIG_CRYPTO_CAMELLIA=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m