diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-06-17 04:06:56 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-01-31 09:00:59 -0500 |
commit | d5264e2f5c9559340706882eec519728fddb772b (patch) | |
tree | 6f9dc43bb322f9b554e996a84b0b7bedf0a178e8 /arch/m68k/configs/sun3x_defconfig | |
parent | 87511d09206d5fdb178971aa83d0e08082e8c571 (diff) |
m68k/defconfig: Refresh defconfigs for v3.16-rc1--v3.19-rc2
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/configs/sun3x_defconfig')
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 5128a8c3f4e3..69b19b904ec5 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -29,6 +29,7 @@ CONFIG_BOOTINFO_PROC=y | |||
29 | CONFIG_SUN3X=y | 29 | CONFIG_SUN3X=y |
30 | # CONFIG_COMPACTION is not set | 30 | # CONFIG_COMPACTION is not set |
31 | CONFIG_CLEANCACHE=y | 31 | CONFIG_CLEANCACHE=y |
32 | CONFIG_ZPOOL=m | ||
32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 33 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
33 | CONFIG_BINFMT_AOUT=m | 34 | CONFIG_BINFMT_AOUT=m |
34 | CONFIG_BINFMT_MISC=m | 35 | CONFIG_BINFMT_MISC=m |
@@ -48,6 +49,8 @@ CONFIG_NET_IPIP=m | |||
48 | CONFIG_NET_IPGRE_DEMUX=m | 49 | CONFIG_NET_IPGRE_DEMUX=m |
49 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
50 | CONFIG_NET_IPVTI=m | 51 | CONFIG_NET_IPVTI=m |
52 | CONFIG_NET_FOU_IP_TUNNELS=y | ||
53 | CONFIG_GENEVE=m | ||
51 | CONFIG_INET_AH=m | 54 | CONFIG_INET_AH=m |
52 | CONFIG_INET_ESP=m | 55 | CONFIG_INET_ESP=m |
53 | CONFIG_INET_IPCOMP=m | 56 | CONFIG_INET_IPCOMP=m |
@@ -89,6 +92,8 @@ CONFIG_NFT_HASH=m | |||
89 | CONFIG_NFT_COUNTER=m | 92 | CONFIG_NFT_COUNTER=m |
90 | CONFIG_NFT_LOG=m | 93 | CONFIG_NFT_LOG=m |
91 | CONFIG_NFT_LIMIT=m | 94 | CONFIG_NFT_LIMIT=m |
95 | CONFIG_NFT_MASQ=m | ||
96 | CONFIG_NFT_REDIR=m | ||
92 | CONFIG_NFT_NAT=m | 97 | CONFIG_NFT_NAT=m |
93 | CONFIG_NFT_QUEUE=m | 98 | CONFIG_NFT_QUEUE=m |
94 | CONFIG_NFT_REJECT=m | 99 | CONFIG_NFT_REJECT=m |
@@ -156,6 +161,7 @@ CONFIG_IP_SET_HASH_IPMARK=m | |||
156 | CONFIG_IP_SET_HASH_IPPORT=m | 161 | CONFIG_IP_SET_HASH_IPPORT=m |
157 | CONFIG_IP_SET_HASH_IPPORTIP=m | 162 | CONFIG_IP_SET_HASH_IPPORTIP=m |
158 | CONFIG_IP_SET_HASH_IPPORTNET=m | 163 | CONFIG_IP_SET_HASH_IPPORTNET=m |
164 | CONFIG_IP_SET_HASH_MAC=m | ||
159 | CONFIG_IP_SET_HASH_NETPORTNET=m | 165 | CONFIG_IP_SET_HASH_NETPORTNET=m |
160 | CONFIG_IP_SET_HASH_NET=m | 166 | CONFIG_IP_SET_HASH_NET=m |
161 | CONFIG_IP_SET_HASH_NETNET=m | 167 | CONFIG_IP_SET_HASH_NETNET=m |
@@ -163,9 +169,12 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
163 | CONFIG_IP_SET_HASH_NETIFACE=m | 169 | CONFIG_IP_SET_HASH_NETIFACE=m |
164 | CONFIG_IP_SET_LIST_SET=m | 170 | CONFIG_IP_SET_LIST_SET=m |
165 | CONFIG_NF_CONNTRACK_IPV4=m | 171 | CONFIG_NF_CONNTRACK_IPV4=m |
172 | CONFIG_NF_LOG_ARP=m | ||
166 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 173 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
167 | CONFIG_NFT_CHAIN_NAT_IPV4=m | ||
168 | CONFIG_NF_TABLES_ARP=m | 174 | CONFIG_NF_TABLES_ARP=m |
175 | CONFIG_NFT_CHAIN_NAT_IPV4=m | ||
176 | CONFIG_NFT_MASQ_IPV4=m | ||
177 | CONFIG_NFT_REDIR_IPV4=m | ||
169 | CONFIG_IP_NF_IPTABLES=m | 178 | CONFIG_IP_NF_IPTABLES=m |
170 | CONFIG_IP_NF_MATCH_AH=m | 179 | CONFIG_IP_NF_MATCH_AH=m |
171 | CONFIG_IP_NF_MATCH_ECN=m | 180 | CONFIG_IP_NF_MATCH_ECN=m |
@@ -174,8 +183,7 @@ CONFIG_IP_NF_MATCH_TTL=m | |||
174 | CONFIG_IP_NF_FILTER=m | 183 | CONFIG_IP_NF_FILTER=m |
175 | CONFIG_IP_NF_TARGET_REJECT=m | 184 | CONFIG_IP_NF_TARGET_REJECT=m |
176 | CONFIG_IP_NF_TARGET_SYNPROXY=m | 185 | CONFIG_IP_NF_TARGET_SYNPROXY=m |
177 | CONFIG_IP_NF_TARGET_ULOG=m | 186 | CONFIG_IP_NF_NAT=m |
178 | CONFIG_NF_NAT_IPV4=m | ||
179 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 187 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
180 | CONFIG_IP_NF_TARGET_NETMAP=m | 188 | CONFIG_IP_NF_TARGET_NETMAP=m |
181 | CONFIG_IP_NF_TARGET_REDIRECT=m | 189 | CONFIG_IP_NF_TARGET_REDIRECT=m |
@@ -190,6 +198,8 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
190 | CONFIG_NF_CONNTRACK_IPV6=m | 198 | CONFIG_NF_CONNTRACK_IPV6=m |
191 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 199 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
192 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 200 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
201 | CONFIG_NFT_MASQ_IPV6=m | ||
202 | CONFIG_NFT_REDIR_IPV6=m | ||
193 | CONFIG_IP6_NF_IPTABLES=m | 203 | CONFIG_IP6_NF_IPTABLES=m |
194 | CONFIG_IP6_NF_MATCH_AH=m | 204 | CONFIG_IP6_NF_MATCH_AH=m |
195 | CONFIG_IP6_NF_MATCH_EUI64=m | 205 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -206,10 +216,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m | |||
206 | CONFIG_IP6_NF_TARGET_SYNPROXY=m | 216 | CONFIG_IP6_NF_TARGET_SYNPROXY=m |
207 | CONFIG_IP6_NF_MANGLE=m | 217 | CONFIG_IP6_NF_MANGLE=m |
208 | CONFIG_IP6_NF_RAW=m | 218 | CONFIG_IP6_NF_RAW=m |
209 | CONFIG_NF_NAT_IPV6=m | 219 | CONFIG_IP6_NF_NAT=m |
210 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 220 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
211 | CONFIG_IP6_NF_TARGET_NPT=m | 221 | CONFIG_IP6_NF_TARGET_NPT=m |
212 | CONFIG_NF_TABLES_BRIDGE=m | ||
213 | CONFIG_IP_DCCP=m | 222 | CONFIG_IP_DCCP=m |
214 | # CONFIG_IP_DCCP_CCID3 is not set | 223 | # CONFIG_IP_DCCP_CCID3 is not set |
215 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 224 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
@@ -217,6 +226,7 @@ CONFIG_RDS=m | |||
217 | CONFIG_RDS_TCP=m | 226 | CONFIG_RDS_TCP=m |
218 | CONFIG_L2TP=m | 227 | CONFIG_L2TP=m |
219 | CONFIG_ATALK=m | 228 | CONFIG_ATALK=m |
229 | CONFIG_6LOWPAN=m | ||
220 | CONFIG_DNS_RESOLVER=y | 230 | CONFIG_DNS_RESOLVER=y |
221 | CONFIG_BATMAN_ADV=m | 231 | CONFIG_BATMAN_ADV=m |
222 | CONFIG_BATMAN_ADV_DAT=y | 232 | CONFIG_BATMAN_ADV_DAT=y |
@@ -225,9 +235,9 @@ CONFIG_BATMAN_ADV_MCAST=y | |||
225 | CONFIG_NETLINK_DIAG=m | 235 | CONFIG_NETLINK_DIAG=m |
226 | CONFIG_NET_MPLS_GSO=m | 236 | CONFIG_NET_MPLS_GSO=m |
227 | # CONFIG_WIRELESS is not set | 237 | # CONFIG_WIRELESS is not set |
238 | # CONFIG_UEVENT_HELPER is not set | ||
228 | CONFIG_DEVTMPFS=y | 239 | CONFIG_DEVTMPFS=y |
229 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 240 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
230 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
231 | CONFIG_CONNECTOR=m | 241 | CONFIG_CONNECTOR=m |
232 | CONFIG_BLK_DEV_LOOP=y | 242 | CONFIG_BLK_DEV_LOOP=y |
233 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 243 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
@@ -277,6 +287,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | |||
277 | CONFIG_NET_TEAM_MODE_RANDOM=m | 287 | CONFIG_NET_TEAM_MODE_RANDOM=m |
278 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | 288 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m |
279 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | 289 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m |
290 | CONFIG_MACVLAN=m | ||
291 | CONFIG_MACVTAP=m | ||
292 | CONFIG_IPVLAN=m | ||
280 | CONFIG_VXLAN=m | 293 | CONFIG_VXLAN=m |
281 | CONFIG_NETCONSOLE=m | 294 | CONFIG_NETCONSOLE=m |
282 | CONFIG_NETCONSOLE_DYNAMIC=y | 295 | CONFIG_NETCONSOLE_DYNAMIC=y |
@@ -288,6 +301,8 @@ CONFIG_SUN3LANCE=y | |||
288 | # CONFIG_NET_VENDOR_MARVELL is not set | 301 | # CONFIG_NET_VENDOR_MARVELL is not set |
289 | # CONFIG_NET_VENDOR_MICREL is not set | 302 | # CONFIG_NET_VENDOR_MICREL is not set |
290 | # CONFIG_NET_VENDOR_NATSEMI is not set | 303 | # CONFIG_NET_VENDOR_NATSEMI is not set |
304 | # CONFIG_NET_VENDOR_QUALCOMM is not set | ||
305 | # CONFIG_NET_VENDOR_ROCKER is not set | ||
291 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 306 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
292 | # CONFIG_NET_VENDOR_SEEQ is not set | 307 | # CONFIG_NET_VENDOR_SEEQ is not set |
293 | # CONFIG_NET_VENDOR_STMICRO is not set | 308 | # CONFIG_NET_VENDOR_STMICRO is not set |
@@ -327,6 +342,7 @@ CONFIG_HID=m | |||
327 | CONFIG_HIDRAW=y | 342 | CONFIG_HIDRAW=y |
328 | CONFIG_UHID=m | 343 | CONFIG_UHID=m |
329 | # CONFIG_HID_GENERIC is not set | 344 | # CONFIG_HID_GENERIC is not set |
345 | # CONFIG_HID_PLANTRONICS is not set | ||
330 | # CONFIG_USB_SUPPORT is not set | 346 | # CONFIG_USB_SUPPORT is not set |
331 | CONFIG_RTC_CLASS=y | 347 | CONFIG_RTC_CLASS=y |
332 | CONFIG_RTC_DRV_GENERIC=m | 348 | CONFIG_RTC_DRV_GENERIC=m |
@@ -344,6 +360,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y | |||
344 | CONFIG_AUTOFS4_FS=m | 360 | CONFIG_AUTOFS4_FS=m |
345 | CONFIG_FUSE_FS=m | 361 | CONFIG_FUSE_FS=m |
346 | CONFIG_CUSE=m | 362 | CONFIG_CUSE=m |
363 | CONFIG_OVERLAY_FS=m | ||
347 | CONFIG_ISO9660_FS=y | 364 | CONFIG_ISO9660_FS=y |
348 | CONFIG_JOLIET=y | 365 | CONFIG_JOLIET=y |
349 | CONFIG_ZISOFS=y | 366 | CONFIG_ZISOFS=y |
@@ -359,6 +376,7 @@ CONFIG_HFS_FS=m | |||
359 | CONFIG_HFSPLUS_FS=m | 376 | CONFIG_HFSPLUS_FS=m |
360 | CONFIG_CRAMFS=m | 377 | CONFIG_CRAMFS=m |
361 | CONFIG_SQUASHFS=m | 378 | CONFIG_SQUASHFS=m |
379 | CONFIG_SQUASHFS_LZ4=y | ||
362 | CONFIG_SQUASHFS_LZO=y | 380 | CONFIG_SQUASHFS_LZO=y |
363 | CONFIG_MINIX_FS=m | 381 | CONFIG_MINIX_FS=m |
364 | CONFIG_OMFS_FS=m | 382 | CONFIG_OMFS_FS=m |
@@ -432,6 +450,7 @@ CONFIG_ENCRYPTED_KEYS=m | |||
432 | CONFIG_CRYPTO_MANAGER=y | 450 | CONFIG_CRYPTO_MANAGER=y |
433 | CONFIG_CRYPTO_USER=m | 451 | CONFIG_CRYPTO_USER=m |
434 | CONFIG_CRYPTO_CRYPTD=m | 452 | CONFIG_CRYPTO_CRYPTD=m |
453 | CONFIG_CRYPTO_MCRYPTD=m | ||
435 | CONFIG_CRYPTO_TEST=m | 454 | CONFIG_CRYPTO_TEST=m |
436 | CONFIG_CRYPTO_CCM=m | 455 | CONFIG_CRYPTO_CCM=m |
437 | CONFIG_CRYPTO_GCM=m | 456 | CONFIG_CRYPTO_GCM=m |
@@ -466,13 +485,10 @@ CONFIG_CRYPTO_LZO=m | |||
466 | CONFIG_CRYPTO_LZ4=m | 485 | CONFIG_CRYPTO_LZ4=m |
467 | CONFIG_CRYPTO_LZ4HC=m | 486 | CONFIG_CRYPTO_LZ4HC=m |
468 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 487 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
488 | CONFIG_CRYPTO_DRBG_MENU=m | ||
489 | CONFIG_CRYPTO_DRBG_HASH=y | ||
490 | CONFIG_CRYPTO_DRBG_CTR=y | ||
469 | CONFIG_CRYPTO_USER_API_HASH=m | 491 | CONFIG_CRYPTO_USER_API_HASH=m |
470 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 492 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
471 | # CONFIG_CRYPTO_HW is not set | 493 | # CONFIG_CRYPTO_HW is not set |
472 | CONFIG_XZ_DEC_X86=y | ||
473 | CONFIG_XZ_DEC_POWERPC=y | ||
474 | CONFIG_XZ_DEC_IA64=y | ||
475 | CONFIG_XZ_DEC_ARM=y | ||
476 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
477 | CONFIG_XZ_DEC_SPARC=y | ||
478 | CONFIG_XZ_DEC_TEST=m | 494 | CONFIG_XZ_DEC_TEST=m |