diff options
| author | Rhyland Klein <rklein@nvidia.com> | 2012-10-15 13:24:51 -0400 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:36:40 -0700 |
| commit | 93fa30724a7ae1001c1156628814a36e74041e6b (patch) | |
| tree | cd8d903dd6b2174932924509405c1fccadd61f15 /chromeos | |
| parent | 34fddf73157750ca4fb6ac494b6a3886739f096e (diff) | |
CHROMEOS: config: enable e-Crypt FS
At some point ecrypt fs support was disabled. It is required for
Chromeos so enable it again.
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Change-Id: I582601d8f0e6fcb7cc3281e6f76b375758f1682b
Reviewed-on: http://git-master/r/144647
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Allen Martin <amartin@nvidia.com>
Rebase-Id: R2416fe77c82345fa96977c7539052d715ed2cdd2
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/config/armel/chromeos-exynos5.flavour.config | 1 | ||||
| -rw-r--r-- | chromeos/config/armel/chromeos-tegra2.flavour.config | 1 | ||||
| -rw-r--r-- | chromeos/config/armel/chromeos-tegra3.flavour.config | 1 | ||||
| -rw-r--r-- | chromeos/config/armel/chromiumos-arm.flavour.config | 1 | ||||
| -rw-r--r-- | chromeos/config/base.config | 1 | ||||
| -rw-r--r-- | chromeos/config/i386/common.config | 1 | ||||
| -rw-r--r-- | chromeos/config/x86_64/common.config | 1 |
7 files changed, 1 insertions, 6 deletions
diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config index 2f8e1dbb3167..e922dcf3755a 100644 --- a/chromeos/config/armel/chromeos-exynos5.flavour.config +++ b/chromeos/config/armel/chromeos-exynos5.flavour.config @@ -161,7 +161,6 @@ CONFIG_DRM_KMS_HELPER=y # CONFIG_DW_DMAC is not set # CONFIG_DW_WATCHDOG is not set CONFIG_EARLY_PRINTK=y -CONFIG_ECRYPT_FS=y CONFIG_ELF_CORE=y # CONFIG_EVM is not set CONFIG_EXT3_DEFAULTS_TO_ORDERED=y diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config index 0573464b9d68..098af9353a42 100644 --- a/chromeos/config/armel/chromeos-tegra2.flavour.config +++ b/chromeos/config/armel/chromeos-tegra2.flavour.config @@ -185,7 +185,6 @@ CONFIG_DM_VERITY=y # CONFIG_E1000 is not set # CONFIG_E1000E is not set CONFIG_EARLY_PRINTK=y -CONFIG_ECRYPT_FS=y CONFIG_ELF_CORE=y # CONFIG_ENIC is not set # CONFIG_EPIC100 is not set diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config index 6d4d1f4a721b..77c46b956fe0 100644 --- a/chromeos/config/armel/chromeos-tegra3.flavour.config +++ b/chromeos/config/armel/chromeos-tegra3.flavour.config @@ -221,7 +221,6 @@ CONFIG_DUMMY=y # CONFIG_E1000 is not set # CONFIG_E1000E is not set # CONFIG_EARLY_PRINTK is not set -# CONFIG_ECRYPT_FS is not set # CONFIG_ELF_CORE is not set # CONFIG_ENIC is not set # CONFIG_EPIC100 is not set diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config index 53878ead5786..a30579abc787 100644 --- a/chromeos/config/armel/chromiumos-arm.flavour.config +++ b/chromeos/config/armel/chromiumos-arm.flavour.config @@ -185,7 +185,6 @@ CONFIG_DM_VERITY=y # CONFIG_E1000 is not set # CONFIG_E1000E is not set CONFIG_EARLY_PRINTK=y -CONFIG_ECRYPT_FS=y CONFIG_ELF_CORE=y # CONFIG_ENIC is not set # CONFIG_EPIC100 is not set diff --git a/chromeos/config/base.config b/chromeos/config/base.config index 290345c6a590..af48e28855b6 100644 --- a/chromeos/config/base.config +++ b/chromeos/config/base.config @@ -321,6 +321,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_DYNAMIC_FTRACE=y # CONFIG_ECHO is not set # CONFIG_ECONET is not set +CONFIG_ECRYPT_FS=y # CONFIG_EEPROM_93XX46 is not set # CONFIG_EEPROM_AT24 is not set # CONFIG_EEPROM_AT25 is not set diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config index 371e48f07d19..6c2ffc110023 100644 --- a/chromeos/config/i386/common.config +++ b/chromeos/config/i386/common.config @@ -284,7 +284,6 @@ CONFIG_E1000=m CONFIG_E1000E=m CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_ECRYPT_FS=y # CONFIG_EDAC is not set # CONFIG_EDD is not set # CONFIG_EEEPC_LAPTOP is not set diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config index 8ac80e74f58f..fb34b07dfeb6 100644 --- a/chromeos/config/x86_64/common.config +++ b/chromeos/config/x86_64/common.config @@ -301,7 +301,6 @@ CONFIG_E1000=m CONFIG_E1000E=m CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_ECRYPT_FS=y # CONFIG_EDAC is not set # CONFIG_EDD is not set # CONFIG_EEEPC_LAPTOP is not set |