diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-19 12:18:44 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-19 12:18:44 +0800 |
| commit | 842e734173f67f8023fd580bd02050eec452d503 (patch) | |
| tree | 47f8e4f89f978dfc9886c1796b2acc796f40136b /arch | |
| parent | 9b2555d5cad2b2760d0e4f5126788f9e003979fd (diff) | |
ENGR00271679-3 Add SoloLite into Android JB release
Align imx6s_android_defconfig with imx6_android_defconfig
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/imx6s_android_defconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/configs/imx6s_android_defconfig b/arch/arm/configs/imx6s_android_defconfig index 4aa325cf6f37..a5732193dadd 100644 --- a/arch/arm/configs/imx6s_android_defconfig +++ b/arch/arm/configs/imx6s_android_defconfig @@ -2695,7 +2695,7 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_QUOTACTL is not set CONFIG_AUTOFS4_FS=m -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=y # # Caches @@ -2911,6 +2911,7 @@ CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_MANAGER=y @@ -2922,7 +2923,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_TEST=m -# CONFIG_CRYPTO_CRYPTODEV is not set +CONFIG_CRYPTO_CRYPTODEV=y # # Authenticated Encryption with Associated Data @@ -2962,7 +2963,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set CONFIG_CRYPTO_SHA1=y -# CONFIG_CRYPTO_SHA256 is not set +CONFIG_CRYPTO_SHA256=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set @@ -2998,8 +2999,9 @@ CONFIG_CRYPTO_LZO=y # Random Number Generation # # CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_USER_API_HASH is not set -# CONFIG_CRYPTO_USER_API_SKCIPHER is not set +CONFIG_CRYPTO_USER_API=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_FSL_CAAM is not set # CONFIG_CRYPTO_DEV_DCP is not set |