Skip to content

Commit 553b20b

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v6.1-rc1
 - Shuffle crypto configuration (cfr. commit f1f142a ("crypto: Kconfig - add submenus")). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/c11de475ba9ba580e7e20cc349919ecfc36c8407.1666026267.git.geert@linux-m68k.org
1 parent 550a998 commit 553b20b

12 files changed

Lines changed: 252 additions & 252 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -562,29 +562,10 @@ CONFIG_CRYPTO_ECDSA=m
562562
CONFIG_CRYPTO_ECRDSA=m
563563
CONFIG_CRYPTO_SM2=m
564564
CONFIG_CRYPTO_CURVE25519=m
565-
CONFIG_CRYPTO_CHACHA20POLY1305=m
566-
CONFIG_CRYPTO_AEGIS128=m
567-
CONFIG_CRYPTO_CFB=m
568-
CONFIG_CRYPTO_CTS=m
569-
CONFIG_CRYPTO_LRW=m
570-
CONFIG_CRYPTO_OFB=m
571-
CONFIG_CRYPTO_PCBC=m
572-
CONFIG_CRYPTO_XTS=m
573-
CONFIG_CRYPTO_KEYWRAP=m
574-
CONFIG_CRYPTO_ADIANTUM=m
575-
CONFIG_CRYPTO_HCTR2=m
576-
CONFIG_CRYPTO_XCBC=m
577-
CONFIG_CRYPTO_VMAC=m
578-
CONFIG_CRYPTO_MD4=m
579-
CONFIG_CRYPTO_MICHAEL_MIC=m
580-
CONFIG_CRYPTO_RMD160=m
581-
CONFIG_CRYPTO_SHA3=m
582-
CONFIG_CRYPTO_SM3_GENERIC=m
583-
CONFIG_CRYPTO_WP512=m
584565
CONFIG_CRYPTO_AES=y
585566
CONFIG_CRYPTO_AES_TI=m
586567
CONFIG_CRYPTO_ANUBIS=m
587-
CONFIG_CRYPTO_ARC4=m
568+
CONFIG_CRYPTO_ARIA=m
588569
CONFIG_CRYPTO_BLOWFISH=m
589570
CONFIG_CRYPTO_CAMELLIA=m
590571
CONFIG_CRYPTO_CAST5=m
@@ -593,11 +574,30 @@ CONFIG_CRYPTO_DES=m
593574
CONFIG_CRYPTO_FCRYPT=m
594575
CONFIG_CRYPTO_KHAZAD=m
595576
CONFIG_CRYPTO_SEED=m
596-
CONFIG_CRYPTO_ARIA=m
597577
CONFIG_CRYPTO_SERPENT=m
598578
CONFIG_CRYPTO_SM4_GENERIC=m
599579
CONFIG_CRYPTO_TEA=m
600580
CONFIG_CRYPTO_TWOFISH=m
581+
CONFIG_CRYPTO_ADIANTUM=m
582+
CONFIG_CRYPTO_ARC4=m
583+
CONFIG_CRYPTO_CFB=m
584+
CONFIG_CRYPTO_CTS=m
585+
CONFIG_CRYPTO_HCTR2=m
586+
CONFIG_CRYPTO_KEYWRAP=m
587+
CONFIG_CRYPTO_LRW=m
588+
CONFIG_CRYPTO_OFB=m
589+
CONFIG_CRYPTO_PCBC=m
590+
CONFIG_CRYPTO_XTS=m
591+
CONFIG_CRYPTO_AEGIS128=m
592+
CONFIG_CRYPTO_CHACHA20POLY1305=m
593+
CONFIG_CRYPTO_MD4=m
594+
CONFIG_CRYPTO_MICHAEL_MIC=m
595+
CONFIG_CRYPTO_RMD160=m
596+
CONFIG_CRYPTO_SHA3=m
597+
CONFIG_CRYPTO_SM3_GENERIC=m
598+
CONFIG_CRYPTO_VMAC=m
599+
CONFIG_CRYPTO_WP512=m
600+
CONFIG_CRYPTO_XCBC=m
601601
CONFIG_CRYPTO_LZO=m
602602
CONFIG_CRYPTO_842=m
603603
CONFIG_CRYPTO_LZ4=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -519,29 +519,10 @@ CONFIG_CRYPTO_ECDSA=m
519519
CONFIG_CRYPTO_ECRDSA=m
520520
CONFIG_CRYPTO_SM2=m
521521
CONFIG_CRYPTO_CURVE25519=m
522-
CONFIG_CRYPTO_CHACHA20POLY1305=m
523-
CONFIG_CRYPTO_AEGIS128=m
524-
CONFIG_CRYPTO_CFB=m
525-
CONFIG_CRYPTO_CTS=m
526-
CONFIG_CRYPTO_LRW=m
527-
CONFIG_CRYPTO_OFB=m
528-
CONFIG_CRYPTO_PCBC=m
529-
CONFIG_CRYPTO_XTS=m
530-
CONFIG_CRYPTO_KEYWRAP=m
531-
CONFIG_CRYPTO_ADIANTUM=m
532-
CONFIG_CRYPTO_HCTR2=m
533-
CONFIG_CRYPTO_XCBC=m
534-
CONFIG_CRYPTO_VMAC=m
535-
CONFIG_CRYPTO_MD4=m
536-
CONFIG_CRYPTO_MICHAEL_MIC=m
537-
CONFIG_CRYPTO_RMD160=m
538-
CONFIG_CRYPTO_SHA3=m
539-
CONFIG_CRYPTO_SM3_GENERIC=m
540-
CONFIG_CRYPTO_WP512=m
541522
CONFIG_CRYPTO_AES=y
542523
CONFIG_CRYPTO_AES_TI=m
543524
CONFIG_CRYPTO_ANUBIS=m
544-
CONFIG_CRYPTO_ARC4=m
525+
CONFIG_CRYPTO_ARIA=m
545526
CONFIG_CRYPTO_BLOWFISH=m
546527
CONFIG_CRYPTO_CAMELLIA=m
547528
CONFIG_CRYPTO_CAST5=m
@@ -550,11 +531,30 @@ CONFIG_CRYPTO_DES=m
550531
CONFIG_CRYPTO_FCRYPT=m
551532
CONFIG_CRYPTO_KHAZAD=m
552533
CONFIG_CRYPTO_SEED=m
553-
CONFIG_CRYPTO_ARIA=m
554534
CONFIG_CRYPTO_SERPENT=m
555535
CONFIG_CRYPTO_SM4_GENERIC=m
556536
CONFIG_CRYPTO_TEA=m
557537
CONFIG_CRYPTO_TWOFISH=m
538+
CONFIG_CRYPTO_ADIANTUM=m
539+
CONFIG_CRYPTO_ARC4=m
540+
CONFIG_CRYPTO_CFB=m
541+
CONFIG_CRYPTO_CTS=m
542+
CONFIG_CRYPTO_HCTR2=m
543+
CONFIG_CRYPTO_KEYWRAP=m
544+
CONFIG_CRYPTO_LRW=m
545+
CONFIG_CRYPTO_OFB=m
546+
CONFIG_CRYPTO_PCBC=m
547+
CONFIG_CRYPTO_XTS=m
548+
CONFIG_CRYPTO_AEGIS128=m
549+
CONFIG_CRYPTO_CHACHA20POLY1305=m
550+
CONFIG_CRYPTO_MD4=m
551+
CONFIG_CRYPTO_MICHAEL_MIC=m
552+
CONFIG_CRYPTO_RMD160=m
553+
CONFIG_CRYPTO_SHA3=m
554+
CONFIG_CRYPTO_SM3_GENERIC=m
555+
CONFIG_CRYPTO_VMAC=m
556+
CONFIG_CRYPTO_WP512=m
557+
CONFIG_CRYPTO_XCBC=m
558558
CONFIG_CRYPTO_LZO=m
559559
CONFIG_CRYPTO_842=m
560560
CONFIG_CRYPTO_LZ4=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -539,29 +539,10 @@ CONFIG_CRYPTO_ECDSA=m
539539
CONFIG_CRYPTO_ECRDSA=m
540540
CONFIG_CRYPTO_SM2=m
541541
CONFIG_CRYPTO_CURVE25519=m
542-
CONFIG_CRYPTO_CHACHA20POLY1305=m
543-
CONFIG_CRYPTO_AEGIS128=m
544-
CONFIG_CRYPTO_CFB=m
545-
CONFIG_CRYPTO_CTS=m
546-
CONFIG_CRYPTO_LRW=m
547-
CONFIG_CRYPTO_OFB=m
548-
CONFIG_CRYPTO_PCBC=m
549-
CONFIG_CRYPTO_XTS=m
550-
CONFIG_CRYPTO_KEYWRAP=m
551-
CONFIG_CRYPTO_ADIANTUM=m
552-
CONFIG_CRYPTO_HCTR2=m
553-
CONFIG_CRYPTO_XCBC=m
554-
CONFIG_CRYPTO_VMAC=m
555-
CONFIG_CRYPTO_MD4=m
556-
CONFIG_CRYPTO_MICHAEL_MIC=m
557-
CONFIG_CRYPTO_RMD160=m
558-
CONFIG_CRYPTO_SHA3=m
559-
CONFIG_CRYPTO_SM3_GENERIC=m
560-
CONFIG_CRYPTO_WP512=m
561542
CONFIG_CRYPTO_AES=y
562543
CONFIG_CRYPTO_AES_TI=m
563544
CONFIG_CRYPTO_ANUBIS=m
564-
CONFIG_CRYPTO_ARC4=m
545+
CONFIG_CRYPTO_ARIA=m
565546
CONFIG_CRYPTO_BLOWFISH=m
566547
CONFIG_CRYPTO_CAMELLIA=m
567548
CONFIG_CRYPTO_CAST5=m
@@ -570,11 +551,30 @@ CONFIG_CRYPTO_DES=m
570551
CONFIG_CRYPTO_FCRYPT=m
571552
CONFIG_CRYPTO_KHAZAD=m
572553
CONFIG_CRYPTO_SEED=m
573-
CONFIG_CRYPTO_ARIA=m
574554
CONFIG_CRYPTO_SERPENT=m
575555
CONFIG_CRYPTO_SM4_GENERIC=m
576556
CONFIG_CRYPTO_TEA=m
577557
CONFIG_CRYPTO_TWOFISH=m
558+
CONFIG_CRYPTO_ADIANTUM=m
559+
CONFIG_CRYPTO_ARC4=m
560+
CONFIG_CRYPTO_CFB=m
561+
CONFIG_CRYPTO_CTS=m
562+
CONFIG_CRYPTO_HCTR2=m
563+
CONFIG_CRYPTO_KEYWRAP=m
564+
CONFIG_CRYPTO_LRW=m
565+
CONFIG_CRYPTO_OFB=m
566+
CONFIG_CRYPTO_PCBC=m
567+
CONFIG_CRYPTO_XTS=m
568+
CONFIG_CRYPTO_AEGIS128=m
569+
CONFIG_CRYPTO_CHACHA20POLY1305=m
570+
CONFIG_CRYPTO_MD4=m
571+
CONFIG_CRYPTO_MICHAEL_MIC=m
572+
CONFIG_CRYPTO_RMD160=m
573+
CONFIG_CRYPTO_SHA3=m
574+
CONFIG_CRYPTO_SM3_GENERIC=m
575+
CONFIG_CRYPTO_VMAC=m
576+
CONFIG_CRYPTO_WP512=m
577+
CONFIG_CRYPTO_XCBC=m
578578
CONFIG_CRYPTO_LZO=m
579579
CONFIG_CRYPTO_842=m
580580
CONFIG_CRYPTO_LZ4=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -511,29 +511,10 @@ CONFIG_CRYPTO_ECDSA=m
511511
CONFIG_CRYPTO_ECRDSA=m
512512
CONFIG_CRYPTO_SM2=m
513513
CONFIG_CRYPTO_CURVE25519=m
514-
CONFIG_CRYPTO_CHACHA20POLY1305=m
515-
CONFIG_CRYPTO_AEGIS128=m
516-
CONFIG_CRYPTO_CFB=m
517-
CONFIG_CRYPTO_CTS=m
518-
CONFIG_CRYPTO_LRW=m
519-
CONFIG_CRYPTO_OFB=m
520-
CONFIG_CRYPTO_PCBC=m
521-
CONFIG_CRYPTO_XTS=m
522-
CONFIG_CRYPTO_KEYWRAP=m
523-
CONFIG_CRYPTO_ADIANTUM=m
524-
CONFIG_CRYPTO_HCTR2=m
525-
CONFIG_CRYPTO_XCBC=m
526-
CONFIG_CRYPTO_VMAC=m
527-
CONFIG_CRYPTO_MD4=m
528-
CONFIG_CRYPTO_MICHAEL_MIC=m
529-
CONFIG_CRYPTO_RMD160=m
530-
CONFIG_CRYPTO_SHA3=m
531-
CONFIG_CRYPTO_SM3_GENERIC=m
532-
CONFIG_CRYPTO_WP512=m
533514
CONFIG_CRYPTO_AES=y
534515
CONFIG_CRYPTO_AES_TI=m
535516
CONFIG_CRYPTO_ANUBIS=m
536-
CONFIG_CRYPTO_ARC4=m
517+
CONFIG_CRYPTO_ARIA=m
537518
CONFIG_CRYPTO_BLOWFISH=m
538519
CONFIG_CRYPTO_CAMELLIA=m
539520
CONFIG_CRYPTO_CAST5=m
@@ -542,11 +523,30 @@ CONFIG_CRYPTO_DES=m
542523
CONFIG_CRYPTO_FCRYPT=m
543524
CONFIG_CRYPTO_KHAZAD=m
544525
CONFIG_CRYPTO_SEED=m
545-
CONFIG_CRYPTO_ARIA=m
546526
CONFIG_CRYPTO_SERPENT=m
547527
CONFIG_CRYPTO_SM4_GENERIC=m
548528
CONFIG_CRYPTO_TEA=m
549529
CONFIG_CRYPTO_TWOFISH=m
530+
CONFIG_CRYPTO_ADIANTUM=m
531+
CONFIG_CRYPTO_ARC4=m
532+
CONFIG_CRYPTO_CFB=m
533+
CONFIG_CRYPTO_CTS=m
534+
CONFIG_CRYPTO_HCTR2=m
535+
CONFIG_CRYPTO_KEYWRAP=m
536+
CONFIG_CRYPTO_LRW=m
537+
CONFIG_CRYPTO_OFB=m
538+
CONFIG_CRYPTO_PCBC=m
539+
CONFIG_CRYPTO_XTS=m
540+
CONFIG_CRYPTO_AEGIS128=m
541+
CONFIG_CRYPTO_CHACHA20POLY1305=m
542+
CONFIG_CRYPTO_MD4=m
543+
CONFIG_CRYPTO_MICHAEL_MIC=m
544+
CONFIG_CRYPTO_RMD160=m
545+
CONFIG_CRYPTO_SHA3=m
546+
CONFIG_CRYPTO_SM3_GENERIC=m
547+
CONFIG_CRYPTO_VMAC=m
548+
CONFIG_CRYPTO_WP512=m
549+
CONFIG_CRYPTO_XCBC=m
550550
CONFIG_CRYPTO_LZO=m
551551
CONFIG_CRYPTO_842=m
552552
CONFIG_CRYPTO_LZ4=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -521,29 +521,10 @@ CONFIG_CRYPTO_ECDSA=m
521521
CONFIG_CRYPTO_ECRDSA=m
522522
CONFIG_CRYPTO_SM2=m
523523
CONFIG_CRYPTO_CURVE25519=m
524-
CONFIG_CRYPTO_CHACHA20POLY1305=m
525-
CONFIG_CRYPTO_AEGIS128=m
526-
CONFIG_CRYPTO_CFB=m
527-
CONFIG_CRYPTO_CTS=m
528-
CONFIG_CRYPTO_LRW=m
529-
CONFIG_CRYPTO_OFB=m
530-
CONFIG_CRYPTO_PCBC=m
531-
CONFIG_CRYPTO_XTS=m
532-
CONFIG_CRYPTO_KEYWRAP=m
533-
CONFIG_CRYPTO_ADIANTUM=m
534-
CONFIG_CRYPTO_HCTR2=m
535-
CONFIG_CRYPTO_XCBC=m
536-
CONFIG_CRYPTO_VMAC=m
537-
CONFIG_CRYPTO_MD4=m
538-
CONFIG_CRYPTO_MICHAEL_MIC=m
539-
CONFIG_CRYPTO_RMD160=m
540-
CONFIG_CRYPTO_SHA3=m
541-
CONFIG_CRYPTO_SM3_GENERIC=m
542-
CONFIG_CRYPTO_WP512=m
543524
CONFIG_CRYPTO_AES=y
544525
CONFIG_CRYPTO_AES_TI=m
545526
CONFIG_CRYPTO_ANUBIS=m
546-
CONFIG_CRYPTO_ARC4=m
527+
CONFIG_CRYPTO_ARIA=m
547528
CONFIG_CRYPTO_BLOWFISH=m
548529
CONFIG_CRYPTO_CAMELLIA=m
549530
CONFIG_CRYPTO_CAST5=m
@@ -552,11 +533,30 @@ CONFIG_CRYPTO_DES=m
552533
CONFIG_CRYPTO_FCRYPT=m
553534
CONFIG_CRYPTO_KHAZAD=m
554535
CONFIG_CRYPTO_SEED=m
555-
CONFIG_CRYPTO_ARIA=m
556536
CONFIG_CRYPTO_SERPENT=m
557537
CONFIG_CRYPTO_SM4_GENERIC=m
558538
CONFIG_CRYPTO_TEA=m
559539
CONFIG_CRYPTO_TWOFISH=m
540+
CONFIG_CRYPTO_ADIANTUM=m
541+
CONFIG_CRYPTO_ARC4=m
542+
CONFIG_CRYPTO_CFB=m
543+
CONFIG_CRYPTO_CTS=m
544+
CONFIG_CRYPTO_HCTR2=m
545+
CONFIG_CRYPTO_KEYWRAP=m
546+
CONFIG_CRYPTO_LRW=m
547+
CONFIG_CRYPTO_OFB=m
548+
CONFIG_CRYPTO_PCBC=m
549+
CONFIG_CRYPTO_XTS=m
550+
CONFIG_CRYPTO_AEGIS128=m
551+
CONFIG_CRYPTO_CHACHA20POLY1305=m
552+
CONFIG_CRYPTO_MD4=m
553+
CONFIG_CRYPTO_MICHAEL_MIC=m
554+
CONFIG_CRYPTO_RMD160=m
555+
CONFIG_CRYPTO_SHA3=m
556+
CONFIG_CRYPTO_SM3_GENERIC=m
557+
CONFIG_CRYPTO_VMAC=m
558+
CONFIG_CRYPTO_WP512=m
559+
CONFIG_CRYPTO_XCBC=m
560560
CONFIG_CRYPTO_LZO=m
561561
CONFIG_CRYPTO_842=m
562562
CONFIG_CRYPTO_LZ4=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -541,29 +541,10 @@ CONFIG_CRYPTO_ECDSA=m
541541
CONFIG_CRYPTO_ECRDSA=m
542542
CONFIG_CRYPTO_SM2=m
543543
CONFIG_CRYPTO_CURVE25519=m
544-
CONFIG_CRYPTO_CHACHA20POLY1305=m
545-
CONFIG_CRYPTO_AEGIS128=m
546-
CONFIG_CRYPTO_CFB=m
547-
CONFIG_CRYPTO_CTS=m
548-
CONFIG_CRYPTO_LRW=m
549-
CONFIG_CRYPTO_OFB=m
550-
CONFIG_CRYPTO_PCBC=m
551-
CONFIG_CRYPTO_XTS=m
552-
CONFIG_CRYPTO_KEYWRAP=m
553-
CONFIG_CRYPTO_ADIANTUM=m
554-
CONFIG_CRYPTO_HCTR2=m
555-
CONFIG_CRYPTO_XCBC=m
556-
CONFIG_CRYPTO_VMAC=m
557-
CONFIG_CRYPTO_MD4=m
558-
CONFIG_CRYPTO_MICHAEL_MIC=m
559-
CONFIG_CRYPTO_RMD160=m
560-
CONFIG_CRYPTO_SHA3=m
561-
CONFIG_CRYPTO_SM3_GENERIC=m
562-
CONFIG_CRYPTO_WP512=m
563544
CONFIG_CRYPTO_AES=y
564545
CONFIG_CRYPTO_AES_TI=m
565546
CONFIG_CRYPTO_ANUBIS=m
566-
CONFIG_CRYPTO_ARC4=m
547+
CONFIG_CRYPTO_ARIA=m
567548
CONFIG_CRYPTO_BLOWFISH=m
568549
CONFIG_CRYPTO_CAMELLIA=m
569550
CONFIG_CRYPTO_CAST5=m
@@ -572,11 +553,30 @@ CONFIG_CRYPTO_DES=m
572553
CONFIG_CRYPTO_FCRYPT=m
573554
CONFIG_CRYPTO_KHAZAD=m
574555
CONFIG_CRYPTO_SEED=m
575-
CONFIG_CRYPTO_ARIA=m
576556
CONFIG_CRYPTO_SERPENT=m
577557
CONFIG_CRYPTO_SM4_GENERIC=m
578558
CONFIG_CRYPTO_TEA=m
579559
CONFIG_CRYPTO_TWOFISH=m
560+
CONFIG_CRYPTO_ADIANTUM=m
561+
CONFIG_CRYPTO_ARC4=m
562+
CONFIG_CRYPTO_CFB=m
563+
CONFIG_CRYPTO_CTS=m
564+
CONFIG_CRYPTO_HCTR2=m
565+
CONFIG_CRYPTO_KEYWRAP=m
566+
CONFIG_CRYPTO_LRW=m
567+
CONFIG_CRYPTO_OFB=m
568+
CONFIG_CRYPTO_PCBC=m
569+
CONFIG_CRYPTO_XTS=m
570+
CONFIG_CRYPTO_AEGIS128=m
571+
CONFIG_CRYPTO_CHACHA20POLY1305=m
572+
CONFIG_CRYPTO_MD4=m
573+
CONFIG_CRYPTO_MICHAEL_MIC=m
574+
CONFIG_CRYPTO_RMD160=m
575+
CONFIG_CRYPTO_SHA3=m
576+
CONFIG_CRYPTO_SM3_GENERIC=m
577+
CONFIG_CRYPTO_VMAC=m
578+
CONFIG_CRYPTO_WP512=m
579+
CONFIG_CRYPTO_XCBC=m
580580
CONFIG_CRYPTO_LZO=m
581581
CONFIG_CRYPTO_842=m
582582
CONFIG_CRYPTO_LZ4=m

0 commit comments

Comments
 (0)