Module Name: src Committed By: skrll Date: Sun Jun 25 10:06:27 UTC 2017
Modified Files: src/sys/arch/cats/conf: GENERIC Log Message: Comment out a bunch of thing so that a GENERIC kernel boots on my cats with cyclone firmware To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/arch/cats/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/cats/conf/GENERIC diff -u src/sys/arch/cats/conf/GENERIC:1.161 src/sys/arch/cats/conf/GENERIC:1.162 --- src/sys/arch/cats/conf/GENERIC:1.161 Tue Dec 13 20:42:16 2016 +++ src/sys/arch/cats/conf/GENERIC Sun Jun 25 10:06:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.161 2016/12/13 20:42:16 christos Exp $ +# $NetBSD: GENERIC,v 1.162 2017/06/25 10:06:27 skrll Exp $ # # GENERIC machine description file # @@ -53,22 +53,22 @@ makeoptions CPUFLAGS="-march=armv4 -mtun # File systems file-system FFS # UFS -file-system LFS # log-structured file system +#file-system LFS # log-structured file system file-system MFS # memory file system file-system NFS # Network file system -file-system ADOSFS # AmigaDOS-compatible file system -file-system EXT2FS # second extended file system (linux) +#file-system ADOSFS # AmigaDOS-compatible file system +#file-system EXT2FS # second extended file system (linux) file-system CD9660 # ISO 9660 + Rock Ridge file system file-system MSDOSFS # MS-DOS file system file-system FDESC # /dev/fd file-system KERNFS # /kern file-system NULLFS # loopback file system -file-system OVERLAY # overlay filesystem +#file-system OVERLAY # overlay filesystem file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) file-system PROCFS # /proc file-system UMAPFS # NULLFS + uid and gid remapping file-system UNION # union file system -file-system CODA # Coda File System; also needs vcode (below) +#file-system CODA # Coda File System; also needs vcode (below) file-system PTYFS # /dev/pts/N support file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system @@ -92,7 +92,7 @@ options INET6 # IPV6 #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast -options NETATALK # AppleTalk networking +#options NETATALK # AppleTalk networking options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) @@ -154,7 +154,7 @@ options SYSVSHM # System V-like memory # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -options IRQSTATS # manage IRQ statistics +#options IRQSTATS # manage IRQ statistics options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions options MIIVERBOSE # verbose PHY autoconfig messages @@ -221,8 +221,8 @@ ppb* at pci? dev ? function ? # PCI-PCI # Cryptographic Devices # PCI cryptographic devices -hifn* at pci? dev ? function ? # Hifn 7755/7811/795x -ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x +#hifn* at pci? dev ? function ? # Hifn 7755/7811/795x +#ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x # PCI serial interfaces @@ -233,29 +233,29 @@ ubsec* at pci? dev ? function ? # Broadc #lpt* at puc? port ? # || ports on "universal" comm boards # PCI SCSI Controllers and Buses -adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI -scsibus* at adv? +#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI +#scsibus* at adv? #adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI #scsibus* at adw? -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers -scsibus* at ahc? +#ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers +#scsibus* at ahc? #bha* at pci? dev ? function ? # BusLogic 9xx SCSI #scsibus* at bha? -iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI -scsibus* at iha? +#iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI +#scsibus* at iha? #isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers #scsibus* at isp? -pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI -scsibus* at pcscp? -siop* at pci? dev ? function ? # NCR 53c8xx SCSI -scsibus* at siop? -esiop* at pci? dev ? function ? # NCR 53c875 SCSI and newer -scsibus* at esiop? +#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +#scsibus* at pcscp? +#siop* at pci? dev ? function ? # NCR 53c8xx SCSI +#scsibus* at siop? +#esiop* at pci? dev ? function ? # NCR 53c875 SCSI and newer +#scsibus* at esiop? # SCSI devices -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +#sd* at scsibus? target ? lun ? # SCSI disk drives +#st* at scsibus? target ? lun ? # SCSI tape drives +#cd* at scsibus? target ? lun ? # SCSI CD-ROM drives #ch* at scsibus? target ? lun ? # SCSI auto-changers #uk* at scsibus? target ? lun ? # SCSI unknown device #ss* at scsibus? target ? lun ? # SCSI scanner @@ -265,20 +265,20 @@ cd* at scsibus? target ? lun ? # SCSI CD # The 0x0001 flag force the driver to use DMA, even if the driver doesn't know # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. -pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver -acardide* at pci? dev ? function ? # Acard IDE controllers +#pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +#acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers -artsata* at pci? dev ? function ? # Intel i31244 SATA controller -cmdide* at pci? dev ? function ? # CMD tech IDE controllers -cypide* at pci? dev ? function ? # Cypress IDE controllers -hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers -optiide* at pci? dev ? function ? # Opti IDE controllers -pdcide* at pci? dev ? function ? # Promise IDE controllers -pdcsata* at pci? dev ? function ? # Promise SATA150 controllers -satalink* at pci? dev ? function ? # SiI SATALink controllers -siside* at pci? dev ? function ? # SiS IDE controllers -slide* at pci? dev ? function ? # Symphony Labs IDE controllers -viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers +#artsata* at pci? dev ? function ? # Intel i31244 SATA controller +#cmdide* at pci? dev ? function ? # CMD tech IDE controllers +#cypide* at pci? dev ? function ? # Cypress IDE controllers +#hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers +#optiide* at pci? dev ? function ? # Opti IDE controllers +#pdcide* at pci? dev ? function ? # Promise IDE controllers +#pdcsata* at pci? dev ? function ? # Promise SATA150 controllers +#satalink* at pci? dev ? function ? # SiI SATALink controllers +#siside* at pci? dev ? function ? # SiS IDE controllers +#slide* at pci? dev ? function ? # Symphony Labs IDE controllers +#viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers # ATA (IDE) bus support atabus* at ata? @@ -540,8 +540,8 @@ joy* at isapnp? # Game ports (usually # Pseudo-Devices -pseudo-device crypto # /dev/crypto device -pseudo-device swcrypto # software crypto implementation +#pseudo-device crypto # /dev/crypto device +#pseudo-device swcrypto # software crypto implementation # disk/mass storage pseudo-devices pseudo-device ccd # concatenated/striped disk devices @@ -555,12 +555,12 @@ pseudo-device putter # for puffs and p # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter #pseudo-device carp # Common Address Redundancy Protocol -pseudo-device ipfilter # IP filter (firewall) and NAT +#pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) -pseudo-device sl # Serial Line IP -pseudo-device strip # Starmode Radio IP (Metricom) +#pseudo-device sl # Serial Line IP +#pseudo-device strip # Starmode Radio IP (Metricom) pseudo-device tun # network tunneling over tty pseudo-device tap # virtual Ethernet pseudo-device gre # generic L3 over IP tunnel @@ -584,7 +584,7 @@ pseudo-device sequencer # MIDI sequence pseudo-device clockctl # user control of clock subsystem # a pseudo device needed for Coda # also needs CODA (above) -pseudo-device vcoda # coda minicache <-> venus comm. +#pseudo-device vcoda # coda minicache <-> venus comm. # mouse & keyboard multiplexor pseudo-devices pseudo-device wsmux