diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-08 16:19:26 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-08 16:19:26 -0800 |
| commit | 5e537f041bd05cddee0d2a2fb3013ee642064cc6 (patch) | |
| tree | bd931ba4eb4cd5979887f49fa7e2b4aa4013d985 | |
| parent | 2216773fc021964a413409141d439de4f6a108f7 (diff) | |
defconfigs: Enable ecryptfs
Per Zach's request, enabling ecryptfs on all android defconfigs
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | arch/arm/configs/android_imx5_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/android_omap3_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/android_omap4_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/android_origen_defconfig | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/android_imx5_defconfig b/arch/arm/configs/android_imx5_defconfig index db2d7eea0dd..dca428c2899 100644 --- a/arch/arm/configs/android_imx5_defconfig +++ b/arch/arm/configs/android_imx5_defconfig @@ -225,6 +225,7 @@ CONFIG_QFMT_V2=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y +CONFIG_ECRYPT_FS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_FS_XATTR=y @@ -243,6 +244,7 @@ CONFIG_TIMER_STATS=y CONFIG_PROVE_LOCKING=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y +CONFIG_KEYS=y CONFIG_SECURITY=y CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/android_omap3_defconfig b/arch/arm/configs/android_omap3_defconfig index 2282ae1f7a6..46dc03a2471 100644 --- a/arch/arm/configs/android_omap3_defconfig +++ b/arch/arm/configs/android_omap3_defconfig @@ -206,6 +206,7 @@ CONFIG_QFMT_V2=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y +CONFIG_ECRYPT_FS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_FS_XATTR=y @@ -224,6 +225,7 @@ CONFIG_TIMER_STATS=y CONFIG_PROVE_LOCKING=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y +CONFIG_KEYS=y CONFIG_SECURITY=y CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig index b80ac84aa88..b303895a256 100644 --- a/arch/arm/configs/android_omap4_defconfig +++ b/arch/arm/configs/android_omap4_defconfig @@ -206,6 +206,7 @@ CONFIG_QFMT_V2=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y +CONFIG_ECRYPT_FS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_FS_XATTR=y @@ -224,6 +225,7 @@ CONFIG_TIMER_STATS=y CONFIG_PROVE_LOCKING=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y +CONFIG_KEYS=y CONFIG_SECURITY=y CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/arch/arm/configs/android_origen_defconfig b/arch/arm/configs/android_origen_defconfig index 2fcd1088213..07161940e70 100644 --- a/arch/arm/configs/android_origen_defconfig +++ b/arch/arm/configs/android_origen_defconfig @@ -213,6 +213,7 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_XATTR=y +CONFIG_ECRYPT_FS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_FS_XATTR=y @@ -237,6 +238,7 @@ CONFIG_DEBUG_USER=y CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_S3C_UART=2 +CONFIG_KEYS=y CONFIG_SECURITY=y CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_ANSI_CPRNG is not set |