Commit 5bcf9381 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/defconfig: Update defconfigs for v4.17-rc3 



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 7124330d

arch/m68k/configs/amiga_defconfig

+12 −8
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_RT=m
@@ -204,7 +204,7 @@ CONFIG_NF_SOCKET_IPV4=m 
CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -233,12 +233,12 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_SOCKET_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -259,7 +259,7 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m
@@ -310,7 +310,6 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m
@@ -414,6 +413,7 @@ CONFIG_ARIADNE=y 
# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

CONFIG_HYDRA=y

CONFIG_APNE=y

CONFIG_ZORRO8390=y
@@ -485,6 +485,7 @@ CONFIG_RTC_DRV_MSM6242=m 
CONFIG_RTC_DRV_RP5C01=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_AMIGA_BUILTIN_SERIAL=y
@@ -621,6 +622,7 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m
@@ -647,6 +649,8 @@ CONFIG_CRYPTO_KHAZAD=m 
CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SPECK=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m

arch/m68k/configs/apollo_defconfig

+12 −8
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_RT=m
@@ -202,7 +202,7 @@ CONFIG_NF_SOCKET_IPV4=m 
CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -231,12 +231,12 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_SOCKET_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -257,7 +257,7 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m
@@ -308,7 +308,6 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m
@@ -392,6 +391,7 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set
@@ -446,6 +446,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y
@@ -580,6 +581,7 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m
@@ -606,6 +608,8 @@ CONFIG_CRYPTO_KHAZAD=m 
CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SPECK=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m

arch/m68k/configs/atari_defconfig

+12 −8
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_RT=m
@@ -202,7 +202,7 @@ CONFIG_NF_SOCKET_IPV4=m 
CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -231,12 +231,12 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_SOCKET_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -257,7 +257,7 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m
@@ -308,7 +308,6 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m
@@ -401,6 +400,7 @@ CONFIG_ATARILANCE=y 
# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

CONFIG_NE2000=y

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set
@@ -461,6 +461,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_NATFEAT=y
@@ -602,6 +603,7 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m
@@ -628,6 +630,8 @@ CONFIG_CRYPTO_KHAZAD=m 
CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SPECK=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m

arch/m68k/configs/bvme6000_defconfig

+12 −8
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_RT=m
@@ -200,7 +200,7 @@ CONFIG_NF_SOCKET_IPV4=m 
CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -229,12 +229,12 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_SOCKET_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -255,7 +255,7 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m
@@ -306,7 +306,6 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m
@@ -391,6 +390,7 @@ CONFIG_BVME6000_NET=y 
# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set
@@ -439,6 +439,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m
@@ -572,6 +573,7 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m
@@ -598,6 +600,8 @@ CONFIG_CRYPTO_KHAZAD=m 
CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SPECK=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m

arch/m68k/configs/hp300_defconfig

+12 −8
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_INET=m

CONFIG_NF_TABLES_NETDEV=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_RT=m
@@ -202,7 +202,7 @@ CONFIG_NF_SOCKET_IPV4=m 
CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -231,12 +231,12 @@ CONFIG_IP_NF_ARP_MANGLE=m 
CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NF_SOCKET_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -257,7 +257,7 @@ CONFIG_IP6_NF_RAW=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_IP6_NF_TARGET_NPT=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NF_TABLES_BRIDGE=y

CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_LOG_BRIDGE=m
@@ -308,7 +308,6 @@ CONFIG_NET_MPLS_GSO=m 
CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_NET_L3_MASTER_DEV=y

CONFIG_AF_KCM=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m
@@ -393,6 +392,7 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set
@@ -449,6 +449,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y

CONFIG_REISERFS_FS=m
@@ -582,6 +583,7 @@ CONFIG_CRYPTO_CRYPTD=m 
CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m
@@ -608,6 +610,8 @@ CONFIG_CRYPTO_KHAZAD=m 
CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SPECK=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m