Skip to content

Commit bb87388

Browse files
hcahcaVasily Gorbik
hcahca
authored and
Vasily Gorbik
committed
s390: update defconfigs
Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent b43088f commit bb87388

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

‎arch/s390/configs/debug_defconfig‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -723,52 +723,42 @@ CONFIG_CRYPTO_ECDSA=m
723723
CONFIG_CRYPTO_ECRDSA=m
724724
CONFIG_CRYPTO_SM2=m
725725
CONFIG_CRYPTO_CURVE25519=m
726-
CONFIG_CRYPTO_GCM=y
727-
CONFIG_CRYPTO_CHACHA20POLY1305=m
728-
CONFIG_CRYPTO_AEGIS128=m
729-
CONFIG_CRYPTO_SEQIV=y
730-
CONFIG_CRYPTO_CFB=m
731-
CONFIG_CRYPTO_LRW=m
732-
CONFIG_CRYPTO_PCBC=m
733-
CONFIG_CRYPTO_KEYWRAP=m
734-
CONFIG_CRYPTO_ADIANTUM=m
735-
CONFIG_CRYPTO_HCTR2=m
736-
CONFIG_CRYPTO_XCBC=m
737-
CONFIG_CRYPTO_VMAC=m
738-
CONFIG_CRYPTO_CRC32=m
739-
CONFIG_CRYPTO_CRC32_S390=y
740-
CONFIG_CRYPTO_MD4=m
741-
CONFIG_CRYPTO_MD5=y
742-
CONFIG_CRYPTO_MICHAEL_MIC=m
743-
CONFIG_CRYPTO_RMD160=m
744-
CONFIG_CRYPTO_SHA512_S390=m
745-
CONFIG_CRYPTO_SHA1_S390=m
746-
CONFIG_CRYPTO_SHA256_S390=m
747-
CONFIG_CRYPTO_SHA3=m
748-
CONFIG_CRYPTO_SHA3_256_S390=m
749-
CONFIG_CRYPTO_SHA3_512_S390=m
750-
CONFIG_CRYPTO_SM3_GENERIC=m
751-
CONFIG_CRYPTO_WP512=m
752-
CONFIG_CRYPTO_GHASH_S390=m
753726
CONFIG_CRYPTO_AES_TI=m
754-
CONFIG_CRYPTO_AES_S390=m
755727
CONFIG_CRYPTO_ANUBIS=m
756-
CONFIG_CRYPTO_ARC4=m
728+
CONFIG_CRYPTO_ARIA=m
757729
CONFIG_CRYPTO_BLOWFISH=m
758730
CONFIG_CRYPTO_CAMELLIA=m
759731
CONFIG_CRYPTO_CAST5=m
760732
CONFIG_CRYPTO_CAST6=m
761733
CONFIG_CRYPTO_DES=m
762-
CONFIG_CRYPTO_DES_S390=m
763734
CONFIG_CRYPTO_FCRYPT=m
764735
CONFIG_CRYPTO_KHAZAD=m
765-
CONFIG_CRYPTO_CHACHA_S390=m
766736
CONFIG_CRYPTO_SEED=m
767-
CONFIG_CRYPTO_ARIA=m
768737
CONFIG_CRYPTO_SERPENT=m
769738
CONFIG_CRYPTO_SM4_GENERIC=m
770739
CONFIG_CRYPTO_TEA=m
771740
CONFIG_CRYPTO_TWOFISH=m
741+
CONFIG_CRYPTO_ADIANTUM=m
742+
CONFIG_CRYPTO_ARC4=m
743+
CONFIG_CRYPTO_CFB=m
744+
CONFIG_CRYPTO_HCTR2=m
745+
CONFIG_CRYPTO_KEYWRAP=m
746+
CONFIG_CRYPTO_LRW=m
747+
CONFIG_CRYPTO_PCBC=m
748+
CONFIG_CRYPTO_AEGIS128=m
749+
CONFIG_CRYPTO_CHACHA20POLY1305=m
750+
CONFIG_CRYPTO_GCM=y
751+
CONFIG_CRYPTO_SEQIV=y
752+
CONFIG_CRYPTO_MD4=m
753+
CONFIG_CRYPTO_MD5=y
754+
CONFIG_CRYPTO_MICHAEL_MIC=m
755+
CONFIG_CRYPTO_RMD160=m
756+
CONFIG_CRYPTO_SHA3=m
757+
CONFIG_CRYPTO_SM3_GENERIC=m
758+
CONFIG_CRYPTO_VMAC=m
759+
CONFIG_CRYPTO_WP512=m
760+
CONFIG_CRYPTO_XCBC=m
761+
CONFIG_CRYPTO_CRC32=m
772762
CONFIG_CRYPTO_842=m
773763
CONFIG_CRYPTO_LZ4=m
774764
CONFIG_CRYPTO_LZ4HC=m
@@ -779,6 +769,16 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
779769
CONFIG_CRYPTO_USER_API_RNG=m
780770
CONFIG_CRYPTO_USER_API_AEAD=m
781771
CONFIG_CRYPTO_STATS=y
772+
CONFIG_CRYPTO_CRC32_S390=y
773+
CONFIG_CRYPTO_SHA512_S390=m
774+
CONFIG_CRYPTO_SHA1_S390=m
775+
CONFIG_CRYPTO_SHA256_S390=m
776+
CONFIG_CRYPTO_SHA3_256_S390=m
777+
CONFIG_CRYPTO_SHA3_512_S390=m
778+
CONFIG_CRYPTO_GHASH_S390=m
779+
CONFIG_CRYPTO_AES_S390=m
780+
CONFIG_CRYPTO_DES_S390=m
781+
CONFIG_CRYPTO_CHACHA_S390=m
782782
CONFIG_ZCRYPT=m
783783
CONFIG_PKEY=m
784784
CONFIG_CRYPTO_PAES_S390=m

‎arch/s390/configs/defconfig‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -707,53 +707,43 @@ CONFIG_CRYPTO_ECDSA=m
707707
CONFIG_CRYPTO_ECRDSA=m
708708
CONFIG_CRYPTO_SM2=m
709709
CONFIG_CRYPTO_CURVE25519=m
710-
CONFIG_CRYPTO_GCM=y
711-
CONFIG_CRYPTO_CHACHA20POLY1305=m
712-
CONFIG_CRYPTO_AEGIS128=m
713-
CONFIG_CRYPTO_SEQIV=y
714-
CONFIG_CRYPTO_CFB=m
715-
CONFIG_CRYPTO_LRW=m
716-
CONFIG_CRYPTO_OFB=m
717-
CONFIG_CRYPTO_PCBC=m
718-
CONFIG_CRYPTO_KEYWRAP=m
719-
CONFIG_CRYPTO_ADIANTUM=m
720-
CONFIG_CRYPTO_HCTR2=m
721-
CONFIG_CRYPTO_XCBC=m
722-
CONFIG_CRYPTO_VMAC=m
723-
CONFIG_CRYPTO_CRC32=m
724-
CONFIG_CRYPTO_CRC32_S390=y
725-
CONFIG_CRYPTO_MD4=m
726-
CONFIG_CRYPTO_MD5=y
727-
CONFIG_CRYPTO_MICHAEL_MIC=m
728-
CONFIG_CRYPTO_RMD160=m
729-
CONFIG_CRYPTO_SHA512_S390=m
730-
CONFIG_CRYPTO_SHA1_S390=m
731-
CONFIG_CRYPTO_SHA256_S390=m
732-
CONFIG_CRYPTO_SHA3=m
733-
CONFIG_CRYPTO_SHA3_256_S390=m
734-
CONFIG_CRYPTO_SHA3_512_S390=m
735-
CONFIG_CRYPTO_SM3_GENERIC=m
736-
CONFIG_CRYPTO_WP512=m
737-
CONFIG_CRYPTO_GHASH_S390=m
738710
CONFIG_CRYPTO_AES_TI=m
739-
CONFIG_CRYPTO_AES_S390=m
740711
CONFIG_CRYPTO_ANUBIS=m
741-
CONFIG_CRYPTO_ARC4=m
712+
CONFIG_CRYPTO_ARIA=m
742713
CONFIG_CRYPTO_BLOWFISH=m
743714
CONFIG_CRYPTO_CAMELLIA=m
744715
CONFIG_CRYPTO_CAST5=m
745716
CONFIG_CRYPTO_CAST6=m
746717
CONFIG_CRYPTO_DES=m
747-
CONFIG_CRYPTO_DES_S390=m
748718
CONFIG_CRYPTO_FCRYPT=m
749719
CONFIG_CRYPTO_KHAZAD=m
750-
CONFIG_CRYPTO_CHACHA_S390=m
751720
CONFIG_CRYPTO_SEED=m
752-
CONFIG_CRYPTO_ARIA=m
753721
CONFIG_CRYPTO_SERPENT=m
754722
CONFIG_CRYPTO_SM4_GENERIC=m
755723
CONFIG_CRYPTO_TEA=m
756724
CONFIG_CRYPTO_TWOFISH=m
725+
CONFIG_CRYPTO_ADIANTUM=m
726+
CONFIG_CRYPTO_ARC4=m
727+
CONFIG_CRYPTO_CFB=m
728+
CONFIG_CRYPTO_HCTR2=m
729+
CONFIG_CRYPTO_KEYWRAP=m
730+
CONFIG_CRYPTO_LRW=m
731+
CONFIG_CRYPTO_OFB=m
732+
CONFIG_CRYPTO_PCBC=m
733+
CONFIG_CRYPTO_AEGIS128=m
734+
CONFIG_CRYPTO_CHACHA20POLY1305=m
735+
CONFIG_CRYPTO_GCM=y
736+
CONFIG_CRYPTO_SEQIV=y
737+
CONFIG_CRYPTO_MD4=m
738+
CONFIG_CRYPTO_MD5=y
739+
CONFIG_CRYPTO_MICHAEL_MIC=m
740+
CONFIG_CRYPTO_RMD160=m
741+
CONFIG_CRYPTO_SHA3=m
742+
CONFIG_CRYPTO_SM3_GENERIC=m
743+
CONFIG_CRYPTO_VMAC=m
744+
CONFIG_CRYPTO_WP512=m
745+
CONFIG_CRYPTO_XCBC=m
746+
CONFIG_CRYPTO_CRC32=m
757747
CONFIG_CRYPTO_842=m
758748
CONFIG_CRYPTO_LZ4=m
759749
CONFIG_CRYPTO_LZ4HC=m
@@ -764,6 +754,16 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
764754
CONFIG_CRYPTO_USER_API_RNG=m
765755
CONFIG_CRYPTO_USER_API_AEAD=m
766756
CONFIG_CRYPTO_STATS=y
757+
CONFIG_CRYPTO_CRC32_S390=y
758+
CONFIG_CRYPTO_SHA512_S390=m
759+
CONFIG_CRYPTO_SHA1_S390=m
760+
CONFIG_CRYPTO_SHA256_S390=m
761+
CONFIG_CRYPTO_SHA3_256_S390=m
762+
CONFIG_CRYPTO_SHA3_512_S390=m
763+
CONFIG_CRYPTO_GHASH_S390=m
764+
CONFIG_CRYPTO_AES_S390=m
765+
CONFIG_CRYPTO_DES_S390=m
766+
CONFIG_CRYPTO_CHACHA_S390=m
767767
CONFIG_ZCRYPT=m
768768
CONFIG_PKEY=m
769769
CONFIG_CRYPTO_PAES_S390=m

0 commit comments

Comments
 (0)