From 0e51720fca54f20ae3b925705dd538930e932f71 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 9 Jul 2010 07:50:34 +0000 Subject: gcc4 is a bloated pig, so a few things must fall off the floppy install media until we can shrink something else. decisions on what has to go made by jsg and I. (subject to change..) --- sys/arch/i386/conf/RAMDISK | 10 +++++----- sys/arch/i386/conf/RAMDISKB | 24 ++++++++++++------------ sys/arch/i386/conf/RAMDISKC | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index dc66089ed91..11d65996ae4 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.169 2010/05/24 21:48:08 jsg Exp $ +# $OpenBSD: RAMDISK,v 1.170 2010/07/09 07:50:33 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -130,10 +130,10 @@ com* at isapnp? #bha* at pci? #bha* at eisa? # XXX eisa still runs in isa-compat #scsibus* at bha? -aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers -aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers +#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers #aha* at isapnp? -scsibus* at aha? +#scsibus* at aha? #ahb* at eisa? # Adaptec 174[024] SCSI controllers #scsibus* at ahb? #ahc0 at isa? # Adaptec 284x SCSI controllers @@ -230,7 +230,7 @@ ep* at pcmcia? # PCMCIA based 3c5xx cards xl* at pci? # 3C9xx ethernet cards rl* at pci? # RealTek 81[23]9 ethernet #epic* at pci? # SMC EPIC/100 ethernet -tl* at pci? # Compaq Thunderlan ethernet cards +#tl* at pci? # Compaq Thunderlan ethernet cards vr* at pci? # VIA Rhine ethernet #wb* at pci? # Winbond W89C840F ethernet dc* at pci? # 21143, "tulip" clone ethernet diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 4f64dacd5d1..ab0a9cf1060 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.113 2010/05/24 21:48:08 jsg Exp $ +# $OpenBSD: RAMDISKB,v 1.114 2010/07/09 07:50:33 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -74,7 +74,7 @@ gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge amdpcib* at pci? # AMD 8111 LPC bridge glxpcib* at pci? # AMD CS5536 PCI-ISA bridge -geodesc* at pci? # Geode SC1100/SCx200 IAOC +#geodesc* at pci? # Geode SC1100/SCx200 IAOC # ISA PCMCIA controllers #pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 @@ -143,8 +143,8 @@ ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface scsibus* at mpi? -gdt* at pci? # ICP Vortex GDT RAID controllers -scsibus* at gdt? +#gdt* at pci? # ICP Vortex GDT RAID controllers +#scsibus* at gdt? #aac* at pci? # Adaptec FSA RAID controllers #scsibus* at aac? ami* at pci? # AMI MegaRAID controllers @@ -156,10 +156,10 @@ cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers scsibus* at cac? #ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers #scsibus* at ciss? -twe* at pci? # 3ware Escalade RAID controllers -scsibus* at twe? -iha* at pci? # Initio Ultra/UltraWide SCSI controllers -scsibus* at iha? +#twe* at pci? # 3ware Escalade RAID controllers +#scsibus* at twe? +#iha* at pci? # Initio Ultra/UltraWide SCSI controllers +#scsibus* at iha? #isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel #scsibus* at isp? #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers @@ -169,8 +169,8 @@ scsibus* at iha? #scsibus* at siop? #adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI #scsibus* at adv? -adw* at pci? # AdvanSys ULTRA WIDE SCSI -scsibus* at adw? +#adw* at pci? # AdvanSys ULTRA WIDE SCSI +#scsibus* at adw? #pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI #scsibus* at pcscp? #sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers @@ -253,7 +253,7 @@ ep* at pci? # 3C59x ethernet cards #sm* at pcmcia? # PCMCIA based sm cards #xe* at pcmcia? # Xircom ethernet #fpa* at pci? # DEC DEFPA FDDI cards -xl* at pci? # 3C9xx ethernet cards +#xl* at pci? # 3C9xx ethernet cards #rl* at pci? # RealTek 81[23]9 ethernet #epic* at pci? # SMC EPIC/100 ethernet #tl* at pci? # Compaq Thunderlan ethernet cards @@ -282,7 +282,7 @@ nfe* at pci? # NVIDIA nForce Ethernet #ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH # Media Independent Interface (mii) drivers -exphy* at mii? # 3Com internal PHYs +#exphy* at mii? # 3Com internal PHYs inphy* at mii? # Intel 82555 PHYs iophy* at mii? # Intel 82553 PHYs icsphy* at mii? # ICS 1890 PHYs diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index a606ccacd15..4e6e7a4c3c1 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.93 2010/05/24 21:48:08 jsg Exp $ +# $OpenBSD: RAMDISKC,v 1.94 2010/07/09 07:50:33 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -258,16 +258,16 @@ fxp* at pci? # EtherExpress 10/100B ethernet fxp* at cardbus? # Intel PRO/100 ethernet #ep0 at pci? # 3C59x ethernet #ep* at pci? # 3C59x ethernet -ne* at pci? # NE2000-compat ethernet -ne* at pcmcia? # PCMCIA based NE2000 +#ne* at pci? # NE2000-compat ethernet +#ne* at pcmcia? # PCMCIA based NE2000 #ep* at pcmcia? # PCMCIA based 3C5xx #sm* at pcmcia? # PCMCIA based sm #xe* at pcmcia? # Xircom ethernet #fpa* at pci? # DEC DEFPA FDDI #xl* at pci? # 3C9xx ethernet #xl* at cardbus? # 3C575 ethernet -rl* at pci? # RealTek 81[23]9 ethernet -rl* at cardbus? # RealTek 81[23]9 ethernet +#rl* at pci? # RealTek 81[23]9 ethernet +#rl* at cardbus? # RealTek 81[23]9 ethernet #epic* at pci? # SMC EPIC/100 ethernet #tl* at pci? # Compaq Thunderlan ethernet #vr* at pci? # VIA Rhine ethernet @@ -315,15 +315,15 @@ iophy* at mii? # Intel 82553 PHYs icsphy* at mii? # ICS 1890 PHYs #lxtphy* at mii? # Level1 LXT970 PHYs nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs +#nsphyter* at mii? # NS and compatible PHYs #qsphy* at mii? # Quality Semi QS6612 PHYs #sqphy* at mii? # Seeq 8x220 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs +#rlphy* at mii? # RealTek 8139 internal PHYs #mtdphy* at mii? # Myson MTD972 PHYs #dcphy* at mii? # Digital Clone PHYs #amphy* at mii? # AMD 79C873 PHYs #tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs +#bmtphy* at mii? # Broadcom 10/100 PHYs rgephy* at mii? # Realtek 8169S/8110S PHY #ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY #ipgphy* at mii? # IC Plus IP1000A PHYs -- cgit v1.2.3