Commit 519f648e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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



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

arch/m68k/configs/amiga_defconfig

+11 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE=m

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -91,6 +91,7 @@ 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_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m
@@ -287,7 +288,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -344,6 +344,7 @@ CONFIG_MACVLAN=m 
CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -354,6 +355,7 @@ CONFIG_ARIADNE=y 
# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -362,6 +364,7 @@ CONFIG_HYDRA=y 
CONFIG_APNE=y

CONFIG_ZORRO8390=y

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set
@@ -447,6 +450,7 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -535,6 +539,7 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m
@@ -542,6 +547,7 @@ CONFIG_CRYPTO_MCRYPTD=m 
CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m
@@ -570,14 +576,15 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DRBG_MENU=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_DRBG_HASH=y

CONFIG_CRYPTO_DRBG_CTR=y

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_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/apollo_defconfig

+11 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE=m

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -89,6 +89,7 @@ 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_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -326,17 +326,20 @@ CONFIG_MACVLAN=m 
CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set
@@ -405,6 +408,7 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -493,6 +497,7 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m
@@ -500,6 +505,7 @@ CONFIG_CRYPTO_MCRYPTD=m 
CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m
@@ -528,14 +534,15 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DRBG_MENU=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_DRBG_HASH=y

CONFIG_CRYPTO_DRBG_CTR=y

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_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/atari_defconfig

+11 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE=m

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -89,6 +89,7 @@ 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_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m
@@ -283,7 +284,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -335,6 +335,7 @@ CONFIG_MACVLAN=m 
CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -342,11 +343,13 @@ CONFIG_ATARILANCE=y 
# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

CONFIG_NE2000=y

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set
@@ -427,6 +430,7 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -515,6 +519,7 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m
@@ -522,6 +527,7 @@ CONFIG_CRYPTO_MCRYPTD=m 
CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m
@@ -550,14 +556,15 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DRBG_MENU=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_DRBG_HASH=y

CONFIG_CRYPTO_DRBG_CTR=y

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_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/bvme6000_defconfig

+11 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE=m

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -87,6 +87,7 @@ 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_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m
@@ -277,7 +278,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -325,17 +325,20 @@ CONFIG_MACVLAN=m 
CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

CONFIG_BVME6000_NET=y

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set
@@ -398,6 +401,7 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -486,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m 
CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DRBG_MENU=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_DRBG_HASH=y

CONFIG_CRYPTO_DRBG_CTR=y

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_HW is not set

CONFIG_XZ_DEC_TEST=m

arch/m68k/configs/hp300_defconfig

+11 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m 
CONFIG_NET_IPGRE=m

CONFIG_NET_IPVTI=m

CONFIG_NET_FOU_IP_TUNNELS=y

CONFIG_GENEVE=m

CONFIG_GENEVE_CORE=m

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m
@@ -89,6 +89,7 @@ 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_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -326,6 +326,7 @@ CONFIG_MACVLAN=m 
CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m
@@ -333,11 +334,13 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set
@@ -407,6 +410,7 @@ CONFIG_UDF_FS=m 
CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y

CONFIG_AFFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -495,6 +499,7 @@ CONFIG_TEST_FIRMWARE=m 
CONFIG_TEST_UDELAY=m

CONFIG_EARLY_PRINTK=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m
@@ -502,6 +507,7 @@ CONFIG_CRYPTO_MCRYPTD=m 
CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m
@@ -530,14 +536,15 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DRBG_MENU=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_DRBG_HASH=y

CONFIG_CRYPTO_DRBG_CTR=y

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_HW is not set

CONFIG_XZ_DEC_TEST=m