Menu
▾
▴
[LV-commit] CVS: kernel-2.5/arch/vax 460.config,1.14,1.15 Kconfig,1.4,1.5 defconfig,1.10,1.11
|
From: Kenn H. <ke...@us...> - 2003-08-28 00:09:56
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1:/tmp/cvs-serv9862/arch/vax Modified Files: 460.config Kconfig defconfig Log Message: Tidy up config a little bit. Use core arch-indep Kconfigs where possible. Index: 460.config =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/460.config,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- 460.config 18 May 2003 18:27:21 -0000 1.14 +++ 460.config 28 Aug 2003 00:09:53 -0000 1.15 @@ -3,25 +3,35 @@ # CONFIG_VAX=y CONFIG_MMU=y -CONFIG_SWAP=y CONFIG_UID16=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set - -# -# General setup -# CONFIG_BINFMT_ELF=y CONFIG_ELF_KERNEL=y CONFIG_KCORE_ELF=y # CONFIG_PREEMPT is not set -CONFIG_NET=y + +# +# Code maturity level options +# +# CONFIG_EXPERIMENTAL is not set + +# +# General setup +# +CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y +CONFIG_LOG_BUF_SHIFT=14 + +# +# Loadable module support +# +# CONFIG_MODULES is not set # -# Bus support +# VAX Bus support # # CONFIG_QBUS is not set CONFIG_VSBUS=y @@ -36,14 +46,19 @@ # CONFIG_BLK_DEV_RAM is not set # +# Networking support +# +CONFIG_NET=y + +# # Networking options # CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_NETLINK_DEV=y # CONFIG_NETFILTER is not set -# CONFIG_FILTER is not set CONFIG_UNIX=y +# CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set @@ -55,6 +70,10 @@ # CONFIG_NET_IPGRE is not set # CONFIG_INET_ECN 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_XFRM_USER is not set # CONFIG_VLAN_8021Q is not set # CONFIG_LLC is not set # CONFIG_DECNET is not set @@ -66,68 +85,111 @@ # CONFIG_NET_SCHED is not set # -# SCSI support +# Network testing # -# CONFIG_SCSI is not set +# CONFIG_NET_PKTGEN is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set # -# Network device support +# Ethernet (10 or 100Mbit) # -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_PPP is not set # CONFIG_SLIP is not set -CONFIG_PPP=y # -# CCP compressors for PPP are only built as modules. +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Token Ring devices (depends on LLC=y) +# + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# VAX Network device support # CONFIG_VAX_LANCE=y # CONFIG_VAX_SGEC is not set # +# SCSI support +# +# CONFIG_SCSI is not set + +# # File systems # -# CONFIG_QUOTA is not set -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_REISERFS_FS is not set +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -# CONFIG_FAT_FS is not set -# CONFIG_CRAMFS is not set -# CONFIG_TMPFS is not set -CONFIG_RAMFS=y -# CONFIG_ISO9660_FS is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set +# CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set -# CONFIG_VXFS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_FAT_FS is not set # CONFIG_NTFS_FS is not set -# CONFIG_HPFS_FS is not set + +# +# Pseudo filesystems +# CONFIG_PROC_FS=y CONFIG_DEVPTS_FS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y + +# +# Miscellaneous filesystems +# +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set # CONFIG_SYSV_FS is not set -# CONFIG_UDF_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_XFS_FS is not set # # Network File Systems # -# CONFIG_CODA_FS is not set CONFIG_NFS_FS=y # CONFIG_NFS_V3 is not set -CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set -CONFIG_SUNRPC=y +CONFIG_ROOT_NFS=y CONFIG_LOCKD=y # CONFIG_EXPORTFS is not set -# CONFIG_CIFS is not set +CONFIG_SUNRPC=y # CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set # CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set # # Partition Types @@ -144,6 +206,7 @@ # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_LDM_PARTITION is not set +# CONFIG_NEC98_PARTITION is not set # CONFIG_SGI_PARTITION is not set CONFIG_ULTRIX_PARTITION=y # CONFIG_SUN_PARTITION is not set @@ -171,7 +234,7 @@ # # Security options # -CONFIG_SECURITY_CAPABILITIES=y +# CONFIG_SECURITY is not set # # Cryptographic options Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Kconfig 24 Aug 2003 12:40:12 -0000 1.4 +++ Kconfig 28 Aug 2003 00:09:53 -0000 1.5 @@ -45,14 +45,9 @@ bool "Preemptible kernel (currently broken)" default n -config NET - bool "Networking support" - default y - - source "init/Kconfig" -menu "Bus support" +menu "VAX Bus support" config QBUS bool "Support for Q-bus" @@ -71,110 +66,51 @@ source "drivers/block/Kconfig" -if NET source "net/Kconfig" -endif - - -menu "SCSI support" - -config SCSI - bool "SCSI support" - default n - -if SCSI - -comment "SCSI support type (disk, tape, CDROM)" - -config BLK_DEV_SD - bool "SCSI disk support" - default y - -config CHR_DEV_ST - bool "SCSI tape support" - default y -config BLK_DEV_SR - bool "SCSI CDROM support" - default y - -config CHR_DEV_SG - bool "SCSI generic device support" - default y - -comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs" +if NETDEVICES +menu "VAX Network device support" -config SCSI_MULTI_LUN - bool "Probe all LUNs on each SCSI device" +config VAX_LANCE + bool "LANCE ethernet controller support" default n -config SCSI_CONSTANTS - bool "Verbose SCSI error reporting" - default y - -comment "SCSI low-level drivers" - -config SCSI_VAX_5380 - bool "NCR53C80 Scsi Driver (used in VAXstation/MicroVAX 3100 family)" +config VAX_SGEC + bool "SGEC ethernet controller support (EXPERIMENTAL)" default n -config SCSI_VAX_53C94 - bool "NCR53C94 Scsi Driver (used in VAXstation 4000 family) (NOT WORKING)" +config DELQA + bool "DELQA/DEQNA Q-bus ethernet controller support" + depends QBUS default n -endif - endmenu +endif -if NET -menu "Network device support" - -config NETDEVICES - bool "Network device support" - -if NETDEVICES -config DUMMY - bool "Dummy net driver support" - default n - -config SLIP - bool "SLIP (serial line) support" - default n -config SLIP_COMPRESSED - bool " CSLIP compressed headers" - depends SLIP - default y +menu "SCSI support" -config SLIP_SMART - bool " Keepalive and linefill" - depends SLIP +config SCSI + bool "SCSI support" default n -config PPP - bool "PPP (point-to-point) support" - default n +if SCSI -comment "CCP compressors for PPP are only built as modules." - depends PPP +source "drivers/scsi/Kconfig" -config VAX_LANCE - bool "LANCE ethernet controller support" - default n +comment "VAX SCSI low-level drivers" -config VAX_SGEC - bool "SGEC ethernet controller support (EXPERIMENTAL)" +config SCSI_VAX_5380 + bool "NCR53C80 Scsi Driver (used in VAXstation/MicroVAX 3100 family)" default n -config DELQA - bool "DELQA/DEQNA Q-bus ethernet controller support" - depends QBUS +config SCSI_VAX_53C94 + bool "NCR53C94 Scsi Driver (used in VAXstation 4000 family) (NOT WORKING)" default n endif endmenu -endif source "fs/Kconfig" Index: defconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/defconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- defconfig 18 May 2003 18:27:21 -0000 1.10 +++ defconfig 28 Aug 2003 00:09:53 -0000 1.11 @@ -3,25 +3,35 @@ # CONFIG_VAX=y CONFIG_MMU=y -CONFIG_SWAP=y CONFIG_UID16=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set - -# -# General setup -# CONFIG_BINFMT_ELF=y CONFIG_ELF_KERNEL=y CONFIG_KCORE_ELF=y # CONFIG_PREEMPT is not set -CONFIG_NET=y + +# +# Code maturity level options +# +# CONFIG_EXPERIMENTAL is not set + +# +# General setup +# +CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y +CONFIG_LOG_BUF_SHIFT=14 + +# +# Loadable module support +# +# CONFIG_MODULES is not set # -# Bus support +# VAX Bus support # # CONFIG_QBUS is not set CONFIG_VSBUS=y @@ -36,14 +46,19 @@ # CONFIG_BLK_DEV_RAM is not set # +# Networking support +# +CONFIG_NET=y + +# # Networking options # CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_NETLINK_DEV=y # CONFIG_NETFILTER is not set -# CONFIG_FILTER is not set CONFIG_UNIX=y +# CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set @@ -55,6 +70,10 @@ # CONFIG_NET_IPGRE is not set # CONFIG_INET_ECN 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_XFRM_USER is not set # CONFIG_VLAN_8021Q is not set # CONFIG_LLC is not set # CONFIG_DECNET is not set @@ -66,68 +85,111 @@ # CONFIG_NET_SCHED is not set # -# SCSI support +# Network testing # -# CONFIG_SCSI is not set +# CONFIG_NET_PKTGEN is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set # -# Network device support +# Ethernet (10 or 100Mbit) # -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_PPP is not set # CONFIG_SLIP is not set -CONFIG_PPP=y # -# CCP compressors for PPP are only built as modules. +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Token Ring devices (depends on LLC=y) +# + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# VAX Network device support # CONFIG_VAX_LANCE=y # CONFIG_VAX_SGEC is not set # +# SCSI support +# +# CONFIG_SCSI is not set + +# # File systems # -# CONFIG_QUOTA is not set -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_REISERFS_FS is not set +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -# CONFIG_FAT_FS is not set -# CONFIG_CRAMFS is not set -# CONFIG_TMPFS is not set -CONFIG_RAMFS=y -# CONFIG_ISO9660_FS is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set +# CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set -# CONFIG_VXFS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_FAT_FS is not set # CONFIG_NTFS_FS is not set -# CONFIG_HPFS_FS is not set + +# +# Pseudo filesystems +# CONFIG_PROC_FS=y CONFIG_DEVPTS_FS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y + +# +# Miscellaneous filesystems +# +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set # CONFIG_SYSV_FS is not set -# CONFIG_UDF_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_XFS_FS is not set # # Network File Systems # -# CONFIG_CODA_FS is not set CONFIG_NFS_FS=y # CONFIG_NFS_V3 is not set -CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set -CONFIG_SUNRPC=y +CONFIG_ROOT_NFS=y CONFIG_LOCKD=y # CONFIG_EXPORTFS is not set -# CONFIG_CIFS is not set +CONFIG_SUNRPC=y # CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set # CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set # # Partition Types @@ -144,6 +206,7 @@ # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_LDM_PARTITION is not set +# CONFIG_NEC98_PARTITION is not set # CONFIG_SGI_PARTITION is not set CONFIG_ULTRIX_PARTITION=y # CONFIG_SUN_PARTITION is not set @@ -171,7 +234,7 @@ # # Security options # -CONFIG_SECURITY_CAPABILITIES=y +# CONFIG_SECURITY is not set # # Cryptographic options |
