Commit 20216fc8 authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds
Browse files

[PATCH] v850: Update defconfigs 



Signed-off-by: default avatarMiles Bader <miles@gnu.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 023239c6

arch/v850/configs/rte-ma1-cb_defconfig

+60 −48
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-uc0

# Thu Jul 21 11:08:27 2005

# Linux kernel version: 2.6.13-uc0

# Fri Sep  2 13:54:27 2005

#

# CONFIG_MMU is not set

# CONFIG_UID16 is not set
@@ -44,6 +44,8 @@ CONFIG_ZERO_BSS=y 
# CONFIG_V850E_HIGHRES_TIMER is not set

# CONFIG_RESET_GUARD is not set

CONFIG_LARGE_ALLOCS=y

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y



#

# Code maturity level options
@@ -110,6 +112,52 @@ CONFIG_BINFMT_FLAT=y 
# CONFIG_BINFMT_SHARED_FLAT is not set

# CONFIG_BINFMT_MISC is not set



#

# Networking

#

CONFIG_NET=y



#

# Networking options

#

# CONFIG_PACKET is not set

# CONFIG_UNIX is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_PNP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_IP_TCPDIAG is not set

# CONFIG_IP_TCPDIAG_IPV6 is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set



#

# Generic Driver Options

#
@@ -158,6 +206,7 @@ CONFIG_MTD_CFI_I2=y 
# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers
@@ -232,6 +281,7 @@ CONFIG_IOSCHED_NOOP=y 
#

# Fusion MPT device support

#

# CONFIG_FUSION is not set



#

# IEEE 1394 (FireWire) support
@@ -244,53 +294,8 @@ CONFIG_IOSCHED_NOOP=y 
# CONFIG_I2O is not set



#

# Networking support

#

CONFIG_NET=y



#

# Networking options

#

# CONFIG_PACKET is not set

# CONFIG_UNIX is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

# CONFIG_IP_PNP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_IP_TCPDIAG is not set

# CONFIG_IP_TCPDIAG_IPV6 is not set

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing

# Network device support

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set
@@ -372,6 +377,8 @@ CONFIG_EEPRO100=y 
# CONFIG_FDDI is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem
@@ -472,6 +479,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
# CONFIG_JBD is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set



#

# XFS support
@@ -479,6 +487,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y

# CONFIG_MAGIC_ROM_PTR is not set

CONFIG_INOTIFY=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set
@@ -524,9 +534,11 @@ CONFIG_RAMFS=y 
#

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

# CONFIG_NFSD is not set

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

arch/v850/configs/rte-me2-cb_defconfig

+15 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-uc0

# Thu Jul 21 11:30:08 2005

# Linux kernel version: 2.6.13-uc0

# Fri Sep  2 13:47:50 2005

#

# CONFIG_MMU is not set

# CONFIG_UID16 is not set
@@ -41,6 +41,8 @@ CONFIG_ZERO_BSS=y 
# CONFIG_V850E_HIGHRES_TIMER is not set

# CONFIG_RESET_GUARD is not set

CONFIG_LARGE_ALLOCS=y

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y



#

# Code maturity level options
@@ -56,7 +58,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_SYSCTL is not set

# CONFIG_AUDIT is not set

# CONFIG_HOTPLUG is not set

# CONFIG_IKCONFIG is not set

CONFIG_EMBEDDED=y
@@ -103,6 +104,11 @@ CONFIG_BINFMT_FLAT=y 
# CONFIG_BINFMT_SHARED_FLAT is not set

# CONFIG_BINFMT_MISC is not set



#

# Networking

#

# CONFIG_NET is not set



#

# Generic Driver Options

#
@@ -151,6 +157,7 @@ CONFIG_MTD_CFI_I2=y 
# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers
@@ -218,6 +225,7 @@ CONFIG_IOSCHED_NOOP=y 
#

# Fusion MPT device support

#

# CONFIG_FUSION is not set



#

# IEEE 1394 (FireWire) support
@@ -228,9 +236,8 @@ CONFIG_IOSCHED_NOOP=y 
#



#

# Networking support

# Network device support

#

# CONFIG_NET is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set
@@ -311,7 +318,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
#

# Ftape, the floppy tape device driver

#

# CONFIG_DRM is not set

# CONFIG_RAW_DRIVER is not set



#
@@ -335,6 +341,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
# CONFIG_JBD is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set



#

# XFS support
@@ -342,6 +349,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y

# CONFIG_MAGIC_ROM_PTR is not set

CONFIG_INOTIFY=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

arch/v850/configs/sim_defconfig

+15 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-uc0

# Thu Jul 21 11:29:27 2005

# Linux kernel version: 2.6.13-uc0

# Fri Sep  2 13:36:43 2005

#

# CONFIG_MMU is not set

# CONFIG_UID16 is not set
@@ -36,6 +36,8 @@ CONFIG_NO_CACHE=y 
CONFIG_ZERO_BSS=y

# CONFIG_RESET_GUARD is not set

CONFIG_LARGE_ALLOCS=y

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y



#

# Code maturity level options
@@ -51,7 +53,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_SYSCTL is not set

# CONFIG_AUDIT is not set

# CONFIG_HOTPLUG is not set

# CONFIG_IKCONFIG is not set

CONFIG_EMBEDDED=y
@@ -98,6 +99,11 @@ CONFIG_BINFMT_FLAT=y 
# CONFIG_BINFMT_SHARED_FLAT is not set

# CONFIG_BINFMT_MISC is not set



#

# Networking

#

# CONFIG_NET is not set



#

# Generic Driver Options

#
@@ -146,6 +152,7 @@ CONFIG_MTD_CFI_I2=y 
# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers
@@ -213,6 +220,7 @@ CONFIG_IOSCHED_NOOP=y 
#

# Fusion MPT device support

#

# CONFIG_FUSION is not set



#

# IEEE 1394 (FireWire) support
@@ -223,9 +231,8 @@ CONFIG_IOSCHED_NOOP=y 
#



#

# Networking support

# Network device support

#

# CONFIG_NET is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set
@@ -300,7 +307,6 @@ CONFIG_SERIO=y 
#

# Ftape, the floppy tape device driver

#

# CONFIG_DRM is not set

# CONFIG_RAW_DRIVER is not set



#
@@ -324,6 +330,7 @@ CONFIG_SERIO=y 
# CONFIG_JBD is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set



#

# XFS support
@@ -331,6 +338,8 @@ CONFIG_SERIO=y 
# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y

# CONFIG_MAGIC_ROM_PTR is not set

CONFIG_INOTIFY=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set