diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-08-19 11:38:49 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:26:00 -0700 |
| commit | 21d53899ead7b1012f627eff48a60eaa4689fd5e (patch) | |
| tree | 2456c2d11a9b1926e74c78dc60f15f18f2443c02 /debian.master/config/powerpc/config.common.powerpc | |
| parent | 3b12dfc3147e0e797431a51a4b6ddc7e58ac61e8 (diff) | |
UBUNTU: [Config] move ECRYPT_FS back to =y for all architectures
ecryptfs is non-autoloadable and so we need ECRYPT_FS=y. ECRYPT_FS has
recently gained support for trusted keys. This adds a dependancy on
ENCRYPTED_KEYS which in turn has a dependancy on TRUSTED_KEYS which in
turn is dependant on CONFIG_TCG_TPM. In order to have ECRYPT_FS built
in we have to build all of these others too.
BugLink: http://bugs.launchpad.net/bugs/827197
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master/config/powerpc/config.common.powerpc')
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 6de96fd93dc..05ca74ff6dc 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -30,8 +30,12 @@ CONFIG_CICADA_PHY=m # CONFIG_COMPACTION is not set CONFIG_CPU_FREQ_STAT=m CONFIG_CRC_T10DIF=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_RNG=y # CONFIG_CRYPTO_SALSA20 is not set +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y # CONFIG_DAB is not set CONFIG_DAVICOM_PHY=m # CONFIG_DEBUG_INFO is not set @@ -277,7 +281,7 @@ CONFIG_SUNGEM=m # CONFIG_SYS_HYPERVISOR is not set # CONFIG_TABLET_USB_WACOM is not set # CONFIG_TCG_TIS is not set -CONFIG_TCG_TPM=m +CONFIG_TCG_TPM=y CONFIG_THERMAL=y # CONFIG_TRANZPORT is not set CONFIG_TTPCI_EEPROM=m |