summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx6_defconfig
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2012-09-12 14:06:15 +0800
committerJason Liu <r64343@freescale.com>2012-09-12 20:01:22 +0800
commit8b83c67be8c209c8a846981178fb24a03262dfb6 (patch)
treed64e8fcc61a44f982904642bd13dacf099838dd7 /arch/arm/configs/imx6_defconfig
parentd650069ff83e47aefdfaef7bfa8de0cbf2cf8d14 (diff)
ENGR00223964: CAAM: enable ahash feature in config
Enable ahash feature in mx6q config. Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'arch/arm/configs/imx6_defconfig')
-rw-r--r--arch/arm/configs/imx6_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 495cdf7ea588..f9a4eacce42b 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -306,6 +306,7 @@ CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_SOC_IMX6Q=y
CONFIG_MACH_MX6Q_ARM2=y
# CONFIG_MACH_MX6SL_ARM2 is not set
+# CONFIG_MACH_MX6SL_EVK is not set
CONFIG_MACH_MX6Q_SABRELITE=y
CONFIG_MACH_MX6Q_SABRESD=y
CONFIG_MACH_MX6Q_SABREAUTO=y
@@ -2275,6 +2276,7 @@ CONFIG_MXC_IPU_V3H=y
#
CONFIG_MXC_VPU=y
# CONFIG_MXC_VPU_DEBUG is not set
+# CONFIG_MX6_VPU_352M is not set
#
# MXC Asynchronous Sample Rate Converter support
@@ -2669,7 +2671,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
-# CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
# CONFIG_BINARY_PRINTF is not set