Skip to content

Commit 86cded5

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v5.6-rc4
 - Drop CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m (depends on BRIDGE_NETFILTER, which is disabled by default since commit 98bda63 ("net: disable BRIDGE_NETFILTER by default")), - Enable modular build of the WireGuard secure network tunnel, - Drop CONFIG_CRYPTO_LIB_{BLAKE2S,CHACHA20POLY1305,CURVE25519}=m (auto-enabled by CONFIG_WIREGUARD). Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent 573a73a commit 86cded5

12 files changed

+12
-48
lines changed

‎arch/m68k/configs/amiga_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
173173
CONFIG_NETFILTER_XT_MATCH_OSF=m
174174
CONFIG_NETFILTER_XT_MATCH_OWNER=m
175175
CONFIG_NETFILTER_XT_MATCH_POLICY=m
176-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
177176
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
178177
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
179178
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -369,6 +368,7 @@ CONFIG_TCM_FILEIO=m
369368
CONFIG_TCM_PSCSI=m
370369
CONFIG_NETDEVICES=y
371370
CONFIG_DUMMY=m
371+
CONFIG_WIREGUARD=m
372372
CONFIG_EQUALIZER=m
373373
CONFIG_NET_TEAM=m
374374
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -613,9 +613,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
613613
CONFIG_CRYPTO_USER_API_SKCIPHER=m
614614
CONFIG_CRYPTO_USER_API_RNG=m
615615
CONFIG_CRYPTO_USER_API_AEAD=m
616-
CONFIG_CRYPTO_LIB_BLAKE2S=m
617-
CONFIG_CRYPTO_LIB_CURVE25519=m
618-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
619616
# CONFIG_CRYPTO_HW is not set
620617
CONFIG_CRC32_SELFTEST=m
621618
CONFIG_CRC64=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
169169
CONFIG_NETFILTER_XT_MATCH_OSF=m
170170
CONFIG_NETFILTER_XT_MATCH_OWNER=m
171171
CONFIG_NETFILTER_XT_MATCH_POLICY=m
172-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
173172
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
174173
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
175174
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -348,6 +347,7 @@ CONFIG_TCM_FILEIO=m
348347
CONFIG_TCM_PSCSI=m
349348
CONFIG_NETDEVICES=y
350349
CONFIG_DUMMY=m
350+
CONFIG_WIREGUARD=m
351351
CONFIG_EQUALIZER=m
352352
CONFIG_NET_TEAM=m
353353
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -569,9 +569,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
569569
CONFIG_CRYPTO_USER_API_SKCIPHER=m
570570
CONFIG_CRYPTO_USER_API_RNG=m
571571
CONFIG_CRYPTO_USER_API_AEAD=m
572-
CONFIG_CRYPTO_LIB_BLAKE2S=m
573-
CONFIG_CRYPTO_LIB_CURVE25519=m
574-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
575572
# CONFIG_CRYPTO_HW is not set
576573
CONFIG_CRC32_SELFTEST=m
577574
CONFIG_CRC64=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
176176
CONFIG_NETFILTER_XT_MATCH_OSF=m
177177
CONFIG_NETFILTER_XT_MATCH_OWNER=m
178178
CONFIG_NETFILTER_XT_MATCH_POLICY=m
179-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
180179
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
181180
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
182181
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -364,6 +363,7 @@ CONFIG_TCM_FILEIO=m
364363
CONFIG_TCM_PSCSI=m
365364
CONFIG_NETDEVICES=y
366365
CONFIG_DUMMY=m
366+
CONFIG_WIREGUARD=m
367367
CONFIG_EQUALIZER=m
368368
CONFIG_NET_TEAM=m
369369
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -591,9 +591,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
591591
CONFIG_CRYPTO_USER_API_SKCIPHER=m
592592
CONFIG_CRYPTO_USER_API_RNG=m
593593
CONFIG_CRYPTO_USER_API_AEAD=m
594-
CONFIG_CRYPTO_LIB_BLAKE2S=m
595-
CONFIG_CRYPTO_LIB_CURVE25519=m
596-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
597594
# CONFIG_CRYPTO_HW is not set
598595
CONFIG_CRC32_SELFTEST=m
599596
CONFIG_CRC64=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
166166
CONFIG_NETFILTER_XT_MATCH_OSF=m
167167
CONFIG_NETFILTER_XT_MATCH_OWNER=m
168168
CONFIG_NETFILTER_XT_MATCH_POLICY=m
169-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
170169
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
171170
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
172171
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -346,6 +345,7 @@ CONFIG_TCM_FILEIO=m
346345
CONFIG_TCM_PSCSI=m
347346
CONFIG_NETDEVICES=y
348347
CONFIG_DUMMY=m
348+
CONFIG_WIREGUARD=m
349349
CONFIG_EQUALIZER=m
350350
CONFIG_NET_TEAM=m
351351
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -562,9 +562,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
562562
CONFIG_CRYPTO_USER_API_SKCIPHER=m
563563
CONFIG_CRYPTO_USER_API_RNG=m
564564
CONFIG_CRYPTO_USER_API_AEAD=m
565-
CONFIG_CRYPTO_LIB_BLAKE2S=m
566-
CONFIG_CRYPTO_LIB_CURVE25519=m
567-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
568565
# CONFIG_CRYPTO_HW is not set
569566
CONFIG_CRC32_SELFTEST=m
570567
CONFIG_CRC64=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
168168
CONFIG_NETFILTER_XT_MATCH_OSF=m
169169
CONFIG_NETFILTER_XT_MATCH_OWNER=m
170170
CONFIG_NETFILTER_XT_MATCH_POLICY=m
171-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
172171
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
173172
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
174173
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -347,6 +346,7 @@ CONFIG_TCM_FILEIO=m
347346
CONFIG_TCM_PSCSI=m
348347
CONFIG_NETDEVICES=y
349348
CONFIG_DUMMY=m
349+
CONFIG_WIREGUARD=m
350350
CONFIG_EQUALIZER=m
351351
CONFIG_NET_TEAM=m
352352
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -571,9 +571,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
571571
CONFIG_CRYPTO_USER_API_SKCIPHER=m
572572
CONFIG_CRYPTO_USER_API_RNG=m
573573
CONFIG_CRYPTO_USER_API_AEAD=m
574-
CONFIG_CRYPTO_LIB_BLAKE2S=m
575-
CONFIG_CRYPTO_LIB_CURVE25519=m
576-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
577574
# CONFIG_CRYPTO_HW is not set
578575
CONFIG_CRC32_SELFTEST=m
579576
CONFIG_CRC64=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
167167
CONFIG_NETFILTER_XT_MATCH_OSF=m
168168
CONFIG_NETFILTER_XT_MATCH_OWNER=m
169169
CONFIG_NETFILTER_XT_MATCH_POLICY=m
170-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
171170
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
172171
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
173172
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -363,6 +362,7 @@ CONFIG_INPUT_ADBHID=y
363362
CONFIG_MAC_EMUMOUSEBTN=y
364363
CONFIG_NETDEVICES=y
365364
CONFIG_DUMMY=m
365+
CONFIG_WIREGUARD=m
366366
CONFIG_EQUALIZER=m
367367
CONFIG_NET_TEAM=m
368368
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -593,9 +593,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
593593
CONFIG_CRYPTO_USER_API_SKCIPHER=m
594594
CONFIG_CRYPTO_USER_API_RNG=m
595595
CONFIG_CRYPTO_USER_API_AEAD=m
596-
CONFIG_CRYPTO_LIB_BLAKE2S=m
597-
CONFIG_CRYPTO_LIB_CURVE25519=m
598-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
599596
# CONFIG_CRYPTO_HW is not set
600597
CONFIG_CRC32_SELFTEST=m
601598
CONFIG_CRC64=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
187187
CONFIG_NETFILTER_XT_MATCH_OSF=m
188188
CONFIG_NETFILTER_XT_MATCH_OWNER=m
189189
CONFIG_NETFILTER_XT_MATCH_POLICY=m
190-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
191190
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
192191
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
193192
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -407,6 +406,7 @@ CONFIG_INPUT_ADBHID=y
407406
CONFIG_MAC_EMUMOUSEBTN=y
408407
CONFIG_NETDEVICES=y
409408
CONFIG_DUMMY=m
409+
CONFIG_WIREGUARD=m
410410
CONFIG_EQUALIZER=m
411411
CONFIG_NET_TEAM=m
412412
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -679,9 +679,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
679679
CONFIG_CRYPTO_USER_API_SKCIPHER=m
680680
CONFIG_CRYPTO_USER_API_RNG=m
681681
CONFIG_CRYPTO_USER_API_AEAD=m
682-
CONFIG_CRYPTO_LIB_BLAKE2S=m
683-
CONFIG_CRYPTO_LIB_CURVE25519=m
684-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
685682
# CONFIG_CRYPTO_HW is not set
686683
CONFIG_CRC32_SELFTEST=m
687684
CONFIG_CRC64=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
165165
CONFIG_NETFILTER_XT_MATCH_OSF=m
166166
CONFIG_NETFILTER_XT_MATCH_OWNER=m
167167
CONFIG_NETFILTER_XT_MATCH_POLICY=m
168-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
169168
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
170169
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
171170
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -345,6 +344,7 @@ CONFIG_TCM_FILEIO=m
345344
CONFIG_TCM_PSCSI=m
346345
CONFIG_NETDEVICES=y
347346
CONFIG_DUMMY=m
347+
CONFIG_WIREGUARD=m
348348
CONFIG_EQUALIZER=m
349349
CONFIG_NET_TEAM=m
350350
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -561,9 +561,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
561561
CONFIG_CRYPTO_USER_API_SKCIPHER=m
562562
CONFIG_CRYPTO_USER_API_RNG=m
563563
CONFIG_CRYPTO_USER_API_AEAD=m
564-
CONFIG_CRYPTO_LIB_BLAKE2S=m
565-
CONFIG_CRYPTO_LIB_CURVE25519=m
566-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
567564
# CONFIG_CRYPTO_HW is not set
568565
CONFIG_CRC32_SELFTEST=m
569566
CONFIG_CRC64=m

‎arch/m68k/configs/mvme16x_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
166166
CONFIG_NETFILTER_XT_MATCH_OSF=m
167167
CONFIG_NETFILTER_XT_MATCH_OWNER=m
168168
CONFIG_NETFILTER_XT_MATCH_POLICY=m
169-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
170169
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
171170
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
172171
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -346,6 +345,7 @@ CONFIG_TCM_FILEIO=m
346345
CONFIG_TCM_PSCSI=m
347346
CONFIG_NETDEVICES=y
348347
CONFIG_DUMMY=m
348+
CONFIG_WIREGUARD=m
349349
CONFIG_EQUALIZER=m
350350
CONFIG_NET_TEAM=m
351351
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -562,9 +562,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
562562
CONFIG_CRYPTO_USER_API_SKCIPHER=m
563563
CONFIG_CRYPTO_USER_API_RNG=m
564564
CONFIG_CRYPTO_USER_API_AEAD=m
565-
CONFIG_CRYPTO_LIB_BLAKE2S=m
566-
CONFIG_CRYPTO_LIB_CURVE25519=m
567-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
568565
# CONFIG_CRYPTO_HW is not set
569566
CONFIG_CRC32_SELFTEST=m
570567
CONFIG_CRC64=m

‎arch/m68k/configs/q40_defconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
167167
CONFIG_NETFILTER_XT_MATCH_OSF=m
168168
CONFIG_NETFILTER_XT_MATCH_OWNER=m
169169
CONFIG_NETFILTER_XT_MATCH_POLICY=m
170-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
171170
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
172171
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
173172
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -353,6 +352,7 @@ CONFIG_TCM_FILEIO=m
353352
CONFIG_TCM_PSCSI=m
354353
CONFIG_NETDEVICES=y
355354
CONFIG_DUMMY=m
355+
CONFIG_WIREGUARD=m
356356
CONFIG_EQUALIZER=m
357357
CONFIG_NET_TEAM=m
358358
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -580,9 +580,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
580580
CONFIG_CRYPTO_USER_API_SKCIPHER=m
581581
CONFIG_CRYPTO_USER_API_RNG=m
582582
CONFIG_CRYPTO_USER_API_AEAD=m
583-
CONFIG_CRYPTO_LIB_BLAKE2S=m
584-
CONFIG_CRYPTO_LIB_CURVE25519=m
585-
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
586583
# CONFIG_CRYPTO_HW is not set
587584
CONFIG_CRC32_SELFTEST=m
588585
CONFIG_CRC64=m

0 commit comments

Comments
 (0)