summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMihai Serban <mihai.serban@nxp.com>2017-04-19 14:21:21 +0300
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commitf23d254803c0085487d36307cb36bfe88319c720 (patch)
treeb48f1e64cdd419514d0e773e23bfec4f802b837f /arch/arm
parentb22524c515619d4ec8e46dff75760e7edb109c84 (diff)
ARM: imx_v7_defconfig: overwrite with savedefconfig output
The automated CI system will check if the configuration files are generated by the 'make savedefconfig' command from now on. We have to create a correct starting point to pass the checks. Signed-off-by: Mihai Serban <mihai.serban@nxp.com> Reviewed-by: Octavian Purdila <octavian.purdila@nxp.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/imx_v7_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 7075478fb59d..2c3ae9811265 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -438,7 +438,6 @@ CONFIG_CRYPTO_TGR192=y
CONFIG_CRYPTO_WP512=y
CONFIG_CRYPTO_BLOWFISH=y
CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_DEV_FSL_CAAM=y
CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y