diff options
| author | Victoria Milhoan <vicki.milhoan@freescale.com> | 2015-01-26 23:54:57 -0700 |
|---|---|---|
| committer | Victoria Milhoan <vicki.milhoan@freescale.com> | 2015-01-26 23:54:57 -0700 |
| commit | 4898da61e916b18a8ca679966972573334cebf30 (patch) | |
| tree | 4ec45544acea75abceb246a227433887d71e81e5 /arch | |
| parent | 2446d78f80d346e1c85dbd84232bb3616dbc02aa (diff) | |
MLK-10143 Enable tcrypt and CAAM driver in default imx_v7 kernel config
This patch enables the CAAM driver in the default imx_v7 kernel
config file, plus configures tcrypt to be built as a module.
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index b63d59b6d2b2..ccd83b56dba8 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -178,7 +178,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_FSL_OTP=y -CONFIG_HW_RANDOM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y # CONFIG_I2C_HELPER_AUTO is not set @@ -382,8 +381,12 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set CONFIG_SECURITYFS=y +CONFIG_CRYPTO_TEST=m # CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW 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 |