commit ab86ca0755eccfdb0b2ffa3fe17cb41a6e61848b
author Victoria Milhoan <vicki.milhoan@freescale.com> Wed Aug 05 11:28:47 2015 -0700
committer Herbert Xu <herbert@gondor.apana.org.au> Mon Aug 10 23:19:05 2015 +0800
tree 3d58ccbd050f28d0c6b5c189a60ed3d4768cb0ac
parent bf83490ee4207de3af59b63870eb9f72f1e523f1

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>

arch/arm/configs/imx_v6_v7_defconfig

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index b47863d..7569b39 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -354,8 +354,7 @@
 # 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