aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-09-26 09:08:48 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-09-26 09:14:13 -0600
commitb721257f3a8fa8cfa20825d2a11a52edbd4c6e6a (patch)
tree8b0bdf92094e3113d6441ef5eb1cb6229bfbfe3f
parente348bbd87ab14dc8896fa9d5d2051818ee1ac8cc (diff)
downloadlinux-linaro-b721257f3a8fa8cfa20825d2a11a52edbd4c6e6a.tar.gz
LINARO: CONFIG: enable crypto modules
And remove crypto-modules from exclude-module files Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/ci/flavourseeds/defconfig.common5
-rw-r--r--debian.linaro/config/config.common.ubuntu11
-rw-r--r--debian.linaro/d-i/exclude-modules.armel-linaro-mx511
-rw-r--r--debian.linaro/d-i/exclude-modules.armel-linaro-u85001
-rw-r--r--debian.linaro/d-i/exclude-modules.armel-linaro-vexpress1
5 files changed, 11 insertions, 8 deletions
diff --git a/debian.linaro/ci/flavourseeds/defconfig.common b/debian.linaro/ci/flavourseeds/defconfig.common
index 6429fb765ca..28561c959fc 100644
--- a/debian.linaro/ci/flavourseeds/defconfig.common
+++ b/debian.linaro/ci/flavourseeds/defconfig.common
@@ -33,8 +33,13 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=y
CONFIG_CRC_T10DIF=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CBC=m
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_TWOFISH=m
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_LL=y
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index e2b3d8ad162..9cfcd09aabb 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -325,11 +325,11 @@ CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_AUTHENC is not set
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-# CONFIG_CRYPTO_BLOWFISH is not set
+CONFIG_CRYPTO_BLOWFISH=m
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
+CONFIG_CRYPTO_CBC=m
# CONFIG_CRYPTO_CCM is not set
CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_CRYPTD is not set
@@ -369,14 +369,15 @@ CONFIG_CRYPTO_RNG2=y
# CONFIG_CRYPTO_SALSA20 is not set
# CONFIG_CRYPTO_SEED is not set
# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SERPENT=m
# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
+CONFIG_CRYPTO_SHA256=m
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_TEA is not set
# CONFIG_CRYPTO_TEST is not set
# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
# CONFIG_CRYPTO_USER_API_HASH is not set
# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
# CONFIG_CRYPTO_VMAC is not set
diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-mx51 b/debian.linaro/d-i/exclude-modules.armel-linaro-mx51
index 024bf819177..f08c68a5bcb 100644
--- a/debian.linaro/d-i/exclude-modules.armel-linaro-mx51
+++ b/debian.linaro/d-i/exclude-modules.armel-linaro-mx51
@@ -1,6 +1,5 @@
block-modules
fat-modules
-crypto-modules
fs-core-modules
fs-secondary-modules
input-modules
diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-u8500 b/debian.linaro/d-i/exclude-modules.armel-linaro-u8500
index 2e53721fae3..531dfaff72c 100644
--- a/debian.linaro/d-i/exclude-modules.armel-linaro-u8500
+++ b/debian.linaro/d-i/exclude-modules.armel-linaro-u8500
@@ -1,5 +1,4 @@
block-modules
-crypto-modules
fat-modules
fs-core-modules
fs-secondary-modules
diff --git a/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress b/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress
index 2e53721fae3..531dfaff72c 100644
--- a/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress
+++ b/debian.linaro/d-i/exclude-modules.armel-linaro-vexpress
@@ -1,5 +1,4 @@
block-modules
-crypto-modules
fat-modules
fs-core-modules
fs-secondary-modules