summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2012-07-04 13:34:55 +0800
committerTerry Lv <r65388@freescale.com>2012-07-25 13:10:26 +0800
commita23fda1bd3fa217651eca032e3ca3ca9dad0178f (patch)
tree8319757a618f8fc5abb8bff20fec40dc75ad94c1 /arch/arm/configs
parenta81568ef1a8d57d72b0a17827e802316ca6ddd5d (diff)
ENGR00215607: CAAM: kernel can't boot up sometimes
ahash still has a scatterlist problem which cause this problem. Thus we disable ahash feature in defconfig and wait for later patch to fix it. Also, we remove caam high freq flag to make bus freq run. Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx6_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 81a054919d61..ffcc997861c4 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -2317,7 +2317,7 @@ CONFIG_MXC_MIPI_CSI2=y
#
# MXC HDMI CEC (Consumer Electronics Control) support
#
-CONFIG_MXC_HDMI_CEC=y
+# CONFIG_MXC_HDMI_CEC is not set
#
# File systems
@@ -2668,7 +2668,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=y
+# CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API is not set
CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
# CONFIG_BINARY_PRINTF is not set