summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorVictoria Milhoan <vicki.milhoan@freescale.com>2015-08-05 11:28:47 -0700
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-10 23:19:05 +0800
commitab86ca0755eccfdb0b2ffa3fe17cb41a6e61848b (patch)
tree3d58ccbd050f28d0c6b5c189a60ed3d4768cb0ac /arch/arm/configs/imx_v6_v7_defconfig
parentbf83490ee4207de3af59b63870eb9f72f1e523f1 (diff)
downloadlinux-stable-ab86ca0755eccfdb0b2ffa3fe17cb41a6e61848b.tar.gz
linux-stable-ab86ca0755eccfdb0b2ffa3fe17cb41a6e61848b.tar.bz2
linux-stable-ab86ca0755eccfdb0b2ffa3fe17cb41a6e61848b.zip
ARM: imx_v6_v7_defconfig: Select CAAM
Select CAAM for i.MX6 devices. Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com> Tested-by: Horia Geantă <horia.geanta@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index b47863d49ac6..7569b391704e 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -354,8 +354,7 @@ CONFIG_PROVE_LOCKING=y
# CONFIG_FTRACE is not set
# CONFIG_ARM_UNWIND is not set
CONFIG_SECURITYFS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m