Commit 95bc06ef authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/defconfig: Update defconfigs for v4.3-rc1 



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

arch/m68k/configs/amiga_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -57,7 +58,6 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -67,10 +67,12 @@ CONFIG_INET_XFRM_MODE_BEET=m 
# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_ILA=m

CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y
@@ -179,6 +181,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m 
CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -206,6 +209,7 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -271,6 +275,7 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -370,6 +375,7 @@ CONFIG_ZORRO8390=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PPP=m
@@ -537,6 +543,7 @@ CONFIG_TEST_USER_COPY=m 
CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

arch/m68k/configs/apollo_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -55,7 +56,6 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -65,10 +65,12 @@ CONFIG_INET_XFRM_MODE_BEET=m 
# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_ILA=m

CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y
@@ -177,6 +179,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m 
CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -204,6 +207,7 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -269,6 +273,7 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -344,6 +349,7 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PPP=m
@@ -495,6 +501,7 @@ CONFIG_TEST_USER_COPY=m 
CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

arch/m68k/configs/atari_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -55,7 +56,6 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -65,10 +65,12 @@ CONFIG_INET_XFRM_MODE_BEET=m 
# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_ILA=m

CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y
@@ -177,6 +179,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m 
CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -204,6 +207,7 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -269,6 +273,7 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -355,6 +360,7 @@ CONFIG_NE2000=y 
# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMC91X=y

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PPP=m
@@ -517,6 +523,7 @@ CONFIG_TEST_USER_COPY=m 
CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

arch/m68k/configs/bvme6000_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -53,7 +54,6 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -63,10 +63,12 @@ CONFIG_INET_XFRM_MODE_BEET=m 
# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_ILA=m

CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y
@@ -175,6 +177,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m 
CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -202,6 +205,7 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -267,6 +271,7 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -343,6 +348,7 @@ CONFIG_BVME6000_NET=y 
# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PPP=m
@@ -488,6 +494,7 @@ CONFIG_TEST_USER_COPY=m 
CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

arch/m68k/configs/hp300_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -55,7 +56,6 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -65,10 +65,12 @@ CONFIG_INET_XFRM_MODE_BEET=m 
# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=m

CONFIG_INET_UDP_DIAG=m

CONFIG_IPV6=m

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_ILA=m

CONFIG_IPV6_VTI=m

CONFIG_IPV6_GRE=m

CONFIG_NETFILTER=y
@@ -177,6 +179,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m 
CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NFT_DUP_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -204,6 +207,7 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -269,6 +273,7 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

CONFIG_MPLS_IPTUNNEL=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -345,6 +350,7 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_PPP=m
@@ -497,6 +503,7 @@ CONFIG_TEST_USER_COPY=m 
CONFIG_TEST_BPF=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m