diff options
author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2015-06-24 10:10:59 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-06-15 10:37:07 -0400 |
commit | a086171ad88685f265b0e42894fcdefa3919cdb2 (patch) | |
tree | 459677d86fd6743e36fe729fc0a9c638d7fe1038 | |
parent | f848dbd3bc1a71274241c080b57eb912ff9f0098 (diff) |
s390: Updated kernel config files
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/configs/default_defconfig | 1 | ||||
-rw-r--r-- | arch/s390/configs/gcov_defconfig | 1 | ||||
-rw-r--r-- | arch/s390/configs/performance_defconfig | 1 | ||||
-rw-r--r-- | arch/s390/defconfig | 4 |
4 files changed, 7 insertions, 0 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig index d5ec71b2ed02..889ea3450210 100644 --- a/arch/s390/configs/default_defconfig +++ b/arch/s390/configs/default_defconfig | |||
@@ -678,6 +678,7 @@ CONFIG_CRYPTO_SHA512_S390=m | |||
678 | CONFIG_CRYPTO_DES_S390=m | 678 | CONFIG_CRYPTO_DES_S390=m |
679 | CONFIG_CRYPTO_AES_S390=m | 679 | CONFIG_CRYPTO_AES_S390=m |
680 | CONFIG_CRYPTO_GHASH_S390=m | 680 | CONFIG_CRYPTO_GHASH_S390=m |
681 | CONFIG_CRYPTO_CRC32_S390=m | ||
681 | CONFIG_ASYMMETRIC_KEY_TYPE=y | 682 | CONFIG_ASYMMETRIC_KEY_TYPE=y |
682 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m | 683 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m |
683 | CONFIG_X509_CERTIFICATE_PARSER=m | 684 | CONFIG_X509_CERTIFICATE_PARSER=m |
diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig index f46a35115d2d..1bcfd764910a 100644 --- a/arch/s390/configs/gcov_defconfig +++ b/arch/s390/configs/gcov_defconfig | |||
@@ -616,6 +616,7 @@ CONFIG_CRYPTO_SHA512_S390=m | |||
616 | CONFIG_CRYPTO_DES_S390=m | 616 | CONFIG_CRYPTO_DES_S390=m |
617 | CONFIG_CRYPTO_AES_S390=m | 617 | CONFIG_CRYPTO_AES_S390=m |
618 | CONFIG_CRYPTO_GHASH_S390=m | 618 | CONFIG_CRYPTO_GHASH_S390=m |
619 | CONFIG_CRYPTO_CRC32_S390=m | ||
619 | CONFIG_ASYMMETRIC_KEY_TYPE=y | 620 | CONFIG_ASYMMETRIC_KEY_TYPE=y |
620 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m | 621 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m |
621 | CONFIG_X509_CERTIFICATE_PARSER=m | 622 | CONFIG_X509_CERTIFICATE_PARSER=m |
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig index ba0f2a58b8cd..13ff090139c8 100644 --- a/arch/s390/configs/performance_defconfig +++ b/arch/s390/configs/performance_defconfig | |||
@@ -615,6 +615,7 @@ CONFIG_CRYPTO_SHA512_S390=m | |||
615 | CONFIG_CRYPTO_DES_S390=m | 615 | CONFIG_CRYPTO_DES_S390=m |
616 | CONFIG_CRYPTO_AES_S390=m | 616 | CONFIG_CRYPTO_AES_S390=m |
617 | CONFIG_CRYPTO_GHASH_S390=m | 617 | CONFIG_CRYPTO_GHASH_S390=m |
618 | CONFIG_CRYPTO_CRC32_S390=m | ||
618 | CONFIG_ASYMMETRIC_KEY_TYPE=y | 619 | CONFIG_ASYMMETRIC_KEY_TYPE=y |
619 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m | 620 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m |
620 | CONFIG_X509_CERTIFICATE_PARSER=m | 621 | CONFIG_X509_CERTIFICATE_PARSER=m |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 3f571ea89509..ccccebeeaaf6 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
@@ -225,12 +225,16 @@ CONFIG_CRYPTO_DEFLATE=m | |||
225 | CONFIG_CRYPTO_LZ4=m | 225 | CONFIG_CRYPTO_LZ4=m |
226 | CONFIG_CRYPTO_LZ4HC=m | 226 | CONFIG_CRYPTO_LZ4HC=m |
227 | CONFIG_CRYPTO_ANSI_CPRNG=m | 227 | CONFIG_CRYPTO_ANSI_CPRNG=m |
228 | CONFIG_CRYPTO_USER_API_HASH=m | ||
229 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
230 | CONFIG_CRYPTO_USER_API_RNG=m | ||
228 | CONFIG_ZCRYPT=m | 231 | CONFIG_ZCRYPT=m |
229 | CONFIG_CRYPTO_SHA1_S390=m | 232 | CONFIG_CRYPTO_SHA1_S390=m |
230 | CONFIG_CRYPTO_SHA256_S390=m | 233 | CONFIG_CRYPTO_SHA256_S390=m |
231 | CONFIG_CRYPTO_SHA512_S390=m | 234 | CONFIG_CRYPTO_SHA512_S390=m |
232 | CONFIG_CRYPTO_DES_S390=m | 235 | CONFIG_CRYPTO_DES_S390=m |
233 | CONFIG_CRYPTO_AES_S390=m | 236 | CONFIG_CRYPTO_AES_S390=m |
237 | CONFIG_CRYPTO_CRC32_S390=m | ||
234 | CONFIG_CRC7=m | 238 | CONFIG_CRC7=m |
235 | # CONFIG_XZ_DEC_X86 is not set | 239 | # CONFIG_XZ_DEC_X86 is not set |
236 | # CONFIG_XZ_DEC_POWERPC is not set | 240 | # CONFIG_XZ_DEC_POWERPC is not set |