Commit 86cded5f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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
    98bda63e ("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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 573a73ab

arch/m68k/configs/amiga_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m 
CONFIG_NETFILTER_XT_MATCH_OSF=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -369,6 +368,7 @@ CONFIG_TCM_FILEIO=m 
CONFIG_TCM_PSCSI=m

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -613,9 +613,6 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

arch/m68k/configs/apollo_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m 
CONFIG_NETFILTER_XT_MATCH_OSF=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -348,6 +347,7 @@ CONFIG_TCM_FILEIO=m 
CONFIG_TCM_PSCSI=m

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -569,9 +569,6 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

arch/m68k/configs/atari_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m 
CONFIG_NETFILTER_XT_MATCH_OSF=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -364,6 +363,7 @@ CONFIG_TCM_FILEIO=m 
CONFIG_TCM_PSCSI=m

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -591,9 +591,6 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

arch/m68k/configs/bvme6000_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m 
CONFIG_NETFILTER_XT_MATCH_OSF=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -346,6 +345,7 @@ CONFIG_TCM_FILEIO=m 
CONFIG_TCM_PSCSI=m

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -562,9 +562,6 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

arch/m68k/configs/hp300_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m 
CONFIG_NETFILTER_XT_MATCH_OSF=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -347,6 +346,7 @@ CONFIG_TCM_FILEIO=m 
CONFIG_TCM_PSCSI=m

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -571,9 +571,6 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE