Skip to content

Commit 382f429

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v5.8-rc3
 - Re-enable modular build of DES crypto algorithm (no longer auto-enabled since commit be01369 ("esp, ah: modernize the crypto algorithm selections")), - Enable modular build of prime numbers and bitops test modules. Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent e3a5494 commit 382f429

12 files changed

+36
-0
lines changed

‎arch/m68k/configs/amiga_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ CONFIG_CRYPTO_BLOWFISH=m
594594
CONFIG_CRYPTO_CAMELLIA=m
595595
CONFIG_CRYPTO_CAST5=m
596596
CONFIG_CRYPTO_CAST6=m
597+
CONFIG_CRYPTO_DES=m
597598
CONFIG_CRYPTO_FCRYPT=m
598599
CONFIG_CRYPTO_KHAZAD=m
599600
CONFIG_CRYPTO_SALSA20=m
@@ -615,6 +616,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
615616
CONFIG_CRYPTO_USER_API_RNG=m
616617
CONFIG_CRYPTO_USER_API_AEAD=m
617618
# CONFIG_CRYPTO_HW is not set
619+
CONFIG_PRIME_NUMBERS=m
618620
CONFIG_CRC32_SELFTEST=m
619621
CONFIG_CRC64=m
620622
CONFIG_XZ_DEC_TEST=m
@@ -643,6 +645,7 @@ CONFIG_TEST_OVERFLOW=m
643645
CONFIG_TEST_RHASHTABLE=m
644646
CONFIG_TEST_HASH=m
645647
CONFIG_TEST_IDA=m
648+
CONFIG_TEST_BITOPS=m
646649
CONFIG_TEST_VMALLOC=m
647650
CONFIG_TEST_USER_COPY=m
648651
CONFIG_TEST_BPF=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@ CONFIG_CRYPTO_BLOWFISH=m
550550
CONFIG_CRYPTO_CAMELLIA=m
551551
CONFIG_CRYPTO_CAST5=m
552552
CONFIG_CRYPTO_CAST6=m
553+
CONFIG_CRYPTO_DES=m
553554
CONFIG_CRYPTO_FCRYPT=m
554555
CONFIG_CRYPTO_KHAZAD=m
555556
CONFIG_CRYPTO_SALSA20=m
@@ -571,6 +572,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
571572
CONFIG_CRYPTO_USER_API_RNG=m
572573
CONFIG_CRYPTO_USER_API_AEAD=m
573574
# CONFIG_CRYPTO_HW is not set
575+
CONFIG_PRIME_NUMBERS=m
574576
CONFIG_CRC32_SELFTEST=m
575577
CONFIG_CRC64=m
576578
CONFIG_XZ_DEC_TEST=m
@@ -599,6 +601,7 @@ CONFIG_TEST_OVERFLOW=m
599601
CONFIG_TEST_RHASHTABLE=m
600602
CONFIG_TEST_HASH=m
601603
CONFIG_TEST_IDA=m
604+
CONFIG_TEST_BITOPS=m
602605
CONFIG_TEST_VMALLOC=m
603606
CONFIG_TEST_USER_COPY=m
604607
CONFIG_TEST_BPF=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ CONFIG_CRYPTO_BLOWFISH=m
572572
CONFIG_CRYPTO_CAMELLIA=m
573573
CONFIG_CRYPTO_CAST5=m
574574
CONFIG_CRYPTO_CAST6=m
575+
CONFIG_CRYPTO_DES=m
575576
CONFIG_CRYPTO_FCRYPT=m
576577
CONFIG_CRYPTO_KHAZAD=m
577578
CONFIG_CRYPTO_SALSA20=m
@@ -593,6 +594,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
593594
CONFIG_CRYPTO_USER_API_RNG=m
594595
CONFIG_CRYPTO_USER_API_AEAD=m
595596
# CONFIG_CRYPTO_HW is not set
597+
CONFIG_PRIME_NUMBERS=m
596598
CONFIG_CRC32_SELFTEST=m
597599
CONFIG_CRC64=m
598600
CONFIG_XZ_DEC_TEST=m
@@ -621,6 +623,7 @@ CONFIG_TEST_OVERFLOW=m
621623
CONFIG_TEST_RHASHTABLE=m
622624
CONFIG_TEST_HASH=m
623625
CONFIG_TEST_IDA=m
626+
CONFIG_TEST_BITOPS=m
624627
CONFIG_TEST_VMALLOC=m
625628
CONFIG_TEST_USER_COPY=m
626629
CONFIG_TEST_BPF=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ CONFIG_CRYPTO_BLOWFISH=m
543543
CONFIG_CRYPTO_CAMELLIA=m
544544
CONFIG_CRYPTO_CAST5=m
545545
CONFIG_CRYPTO_CAST6=m
546+
CONFIG_CRYPTO_DES=m
546547
CONFIG_CRYPTO_FCRYPT=m
547548
CONFIG_CRYPTO_KHAZAD=m
548549
CONFIG_CRYPTO_SALSA20=m
@@ -564,6 +565,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
564565
CONFIG_CRYPTO_USER_API_RNG=m
565566
CONFIG_CRYPTO_USER_API_AEAD=m
566567
# CONFIG_CRYPTO_HW is not set
568+
CONFIG_PRIME_NUMBERS=m
567569
CONFIG_CRC32_SELFTEST=m
568570
CONFIG_CRC64=m
569571
CONFIG_XZ_DEC_TEST=m
@@ -592,6 +594,7 @@ CONFIG_TEST_OVERFLOW=m
592594
CONFIG_TEST_RHASHTABLE=m
593595
CONFIG_TEST_HASH=m
594596
CONFIG_TEST_IDA=m
597+
CONFIG_TEST_BITOPS=m
595598
CONFIG_TEST_VMALLOC=m
596599
CONFIG_TEST_USER_COPY=m
597600
CONFIG_TEST_BPF=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ CONFIG_CRYPTO_BLOWFISH=m
552552
CONFIG_CRYPTO_CAMELLIA=m
553553
CONFIG_CRYPTO_CAST5=m
554554
CONFIG_CRYPTO_CAST6=m
555+
CONFIG_CRYPTO_DES=m
555556
CONFIG_CRYPTO_FCRYPT=m
556557
CONFIG_CRYPTO_KHAZAD=m
557558
CONFIG_CRYPTO_SALSA20=m
@@ -573,6 +574,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
573574
CONFIG_CRYPTO_USER_API_RNG=m
574575
CONFIG_CRYPTO_USER_API_AEAD=m
575576
# CONFIG_CRYPTO_HW is not set
577+
CONFIG_PRIME_NUMBERS=m
576578
CONFIG_CRC32_SELFTEST=m
577579
CONFIG_CRC64=m
578580
CONFIG_XZ_DEC_TEST=m
@@ -601,6 +603,7 @@ CONFIG_TEST_OVERFLOW=m
601603
CONFIG_TEST_RHASHTABLE=m
602604
CONFIG_TEST_HASH=m
603605
CONFIG_TEST_IDA=m
606+
CONFIG_TEST_BITOPS=m
604607
CONFIG_TEST_VMALLOC=m
605608
CONFIG_TEST_USER_COPY=m
606609
CONFIG_TEST_BPF=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ CONFIG_CRYPTO_BLOWFISH=m
574574
CONFIG_CRYPTO_CAMELLIA=m
575575
CONFIG_CRYPTO_CAST5=m
576576
CONFIG_CRYPTO_CAST6=m
577+
CONFIG_CRYPTO_DES=m
577578
CONFIG_CRYPTO_FCRYPT=m
578579
CONFIG_CRYPTO_KHAZAD=m
579580
CONFIG_CRYPTO_SALSA20=m
@@ -595,6 +596,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
595596
CONFIG_CRYPTO_USER_API_RNG=m
596597
CONFIG_CRYPTO_USER_API_AEAD=m
597598
# CONFIG_CRYPTO_HW is not set
599+
CONFIG_PRIME_NUMBERS=m
598600
CONFIG_CRC32_SELFTEST=m
599601
CONFIG_CRC64=m
600602
CONFIG_XZ_DEC_TEST=m
@@ -623,6 +625,7 @@ CONFIG_TEST_OVERFLOW=m
623625
CONFIG_TEST_RHASHTABLE=m
624626
CONFIG_TEST_HASH=m
625627
CONFIG_TEST_IDA=m
628+
CONFIG_TEST_BITOPS=m
626629
CONFIG_TEST_VMALLOC=m
627630
CONFIG_TEST_USER_COPY=m
628631
CONFIG_TEST_BPF=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ CONFIG_CRYPTO_BLOWFISH=m
660660
CONFIG_CRYPTO_CAMELLIA=m
661661
CONFIG_CRYPTO_CAST5=m
662662
CONFIG_CRYPTO_CAST6=m
663+
CONFIG_CRYPTO_DES=m
663664
CONFIG_CRYPTO_FCRYPT=m
664665
CONFIG_CRYPTO_KHAZAD=m
665666
CONFIG_CRYPTO_SALSA20=m
@@ -681,6 +682,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
681682
CONFIG_CRYPTO_USER_API_RNG=m
682683
CONFIG_CRYPTO_USER_API_AEAD=m
683684
# CONFIG_CRYPTO_HW is not set
685+
CONFIG_PRIME_NUMBERS=m
684686
CONFIG_CRC32_SELFTEST=m
685687
CONFIG_CRC64=m
686688
CONFIG_XZ_DEC_TEST=m
@@ -709,6 +711,7 @@ CONFIG_TEST_OVERFLOW=m
709711
CONFIG_TEST_RHASHTABLE=m
710712
CONFIG_TEST_HASH=m
711713
CONFIG_TEST_IDA=m
714+
CONFIG_TEST_BITOPS=m
712715
CONFIG_TEST_VMALLOC=m
713716
CONFIG_TEST_USER_COPY=m
714717
CONFIG_TEST_BPF=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ CONFIG_CRYPTO_BLOWFISH=m
542542
CONFIG_CRYPTO_CAMELLIA=m
543543
CONFIG_CRYPTO_CAST5=m
544544
CONFIG_CRYPTO_CAST6=m
545+
CONFIG_CRYPTO_DES=m
545546
CONFIG_CRYPTO_FCRYPT=m
546547
CONFIG_CRYPTO_KHAZAD=m
547548
CONFIG_CRYPTO_SALSA20=m
@@ -563,6 +564,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
563564
CONFIG_CRYPTO_USER_API_RNG=m
564565
CONFIG_CRYPTO_USER_API_AEAD=m
565566
# CONFIG_CRYPTO_HW is not set
567+
CONFIG_PRIME_NUMBERS=m
566568
CONFIG_CRC32_SELFTEST=m
567569
CONFIG_CRC64=m
568570
CONFIG_XZ_DEC_TEST=m
@@ -591,6 +593,7 @@ CONFIG_TEST_OVERFLOW=m
591593
CONFIG_TEST_RHASHTABLE=m
592594
CONFIG_TEST_HASH=m
593595
CONFIG_TEST_IDA=m
596+
CONFIG_TEST_BITOPS=m
594597
CONFIG_TEST_VMALLOC=m
595598
CONFIG_TEST_USER_COPY=m
596599
CONFIG_TEST_BPF=m

‎arch/m68k/configs/mvme16x_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ CONFIG_CRYPTO_BLOWFISH=m
543543
CONFIG_CRYPTO_CAMELLIA=m
544544
CONFIG_CRYPTO_CAST5=m
545545
CONFIG_CRYPTO_CAST6=m
546+
CONFIG_CRYPTO_DES=m
546547
CONFIG_CRYPTO_FCRYPT=m
547548
CONFIG_CRYPTO_KHAZAD=m
548549
CONFIG_CRYPTO_SALSA20=m
@@ -564,6 +565,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
564565
CONFIG_CRYPTO_USER_API_RNG=m
565566
CONFIG_CRYPTO_USER_API_AEAD=m
566567
# CONFIG_CRYPTO_HW is not set
568+
CONFIG_PRIME_NUMBERS=m
567569
CONFIG_CRC32_SELFTEST=m
568570
CONFIG_CRC64=m
569571
CONFIG_XZ_DEC_TEST=m
@@ -592,6 +594,7 @@ CONFIG_TEST_OVERFLOW=m
592594
CONFIG_TEST_RHASHTABLE=m
593595
CONFIG_TEST_HASH=m
594596
CONFIG_TEST_IDA=m
597+
CONFIG_TEST_BITOPS=m
595598
CONFIG_TEST_VMALLOC=m
596599
CONFIG_TEST_USER_COPY=m
597600
CONFIG_TEST_BPF=m

‎arch/m68k/configs/q40_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@ CONFIG_CRYPTO_BLOWFISH=m
561561
CONFIG_CRYPTO_CAMELLIA=m
562562
CONFIG_CRYPTO_CAST5=m
563563
CONFIG_CRYPTO_CAST6=m
564+
CONFIG_CRYPTO_DES=m
564565
CONFIG_CRYPTO_FCRYPT=m
565566
CONFIG_CRYPTO_KHAZAD=m
566567
CONFIG_CRYPTO_SALSA20=m
@@ -582,6 +583,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
582583
CONFIG_CRYPTO_USER_API_RNG=m
583584
CONFIG_CRYPTO_USER_API_AEAD=m
584585
# CONFIG_CRYPTO_HW is not set
586+
CONFIG_PRIME_NUMBERS=m
585587
CONFIG_CRC32_SELFTEST=m
586588
CONFIG_CRC64=m
587589
CONFIG_XZ_DEC_TEST=m
@@ -610,6 +612,7 @@ CONFIG_TEST_OVERFLOW=m
610612
CONFIG_TEST_RHASHTABLE=m
611613
CONFIG_TEST_HASH=m
612614
CONFIG_TEST_IDA=m
615+
CONFIG_TEST_BITOPS=m
613616
CONFIG_TEST_VMALLOC=m
614617
CONFIG_TEST_USER_COPY=m
615618
CONFIG_TEST_BPF=m

0 commit comments

Comments
 (0)