summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/i386/Makefile8
-rw-r--r--distrib/i386/ramdisk/Makefile9
-rw-r--r--distrib/i386/ramdisk/list.local6
-rw-r--r--distrib/notes/i386/contents13
-rw-r--r--etc/etc.i386/Makefile.inc5
-rw-r--r--sys/arch/i386/compile/.cvsignore3
-rw-r--r--sys/arch/i386/conf/RAMDISK47
-rw-r--r--sys/arch/i386/conf/RAMDISKB122
-rw-r--r--sys/arch/i386/conf/RAMDISKC111
9 files changed, 44 insertions, 280 deletions
diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile
index 2231297f66c..34a72b0ee54 100644
--- a/distrib/i386/Makefile
+++ b/distrib/i386/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.10 2014/03/02 20:19:17 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2015/01/12 17:10:36 deraadt Exp $
-SUBDIR= ramdisk_cd ramdiskA ramdiskB ramdiskC cdfs
+SUBDIR= ramdisk_cd ramdisk
.if make(obj) || make(cleandir) || make(clean)
SUBDIR+= iso
@@ -8,8 +8,6 @@ SUBDIR+= iso
unconfig:
cd ramdisk_cd; ${MAKE} unconfig
- cd ramdiskA; ${MAKE} unconfig
- cd ramdiskB; ${MAKE} unconfig
- cd ramdiskC; ${MAKE} unconfig
+ cd ramdisk; ${MAKE} unconfig
.include <bsd.subdir.mk>
diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile
new file mode 100644
index 00000000000..8c91aa8c126
--- /dev/null
+++ b/distrib/i386/ramdisk/Makefile
@@ -0,0 +1,9 @@
+# $OpenBSD: Makefile,v 1.1 2015/01/12 17:10:37 deraadt Exp $
+
+.PATH: ${.CURDIR}/../ramdiskA
+RAMDISK=RAMDISK
+NOBSDRD=1
+
+.include "${.CURDIR}/../common/Makefile.inc"
+
+LISTS+= ${.CURDIR}/list.local
diff --git a/distrib/i386/ramdisk/list.local b/distrib/i386/ramdisk/list.local
new file mode 100644
index 00000000000..57f8eb0000e
--- /dev/null
+++ b/distrib/i386/ramdisk/list.local
@@ -0,0 +1,6 @@
+# $OpenBSD: list.local,v 1.1 2015/01/12 17:10:38 deraadt Exp $
+
+LINK instbin sbin/fsck_msdos
+LINK instbin sbin/mount_msdos
+
+#TZ
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 5398fdd7c43..e932ca5504d 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,4 +1,4 @@
-dnl $OpenBSD: contents,v 1.76 2014/11/10 07:15:41 jsg Exp $
+dnl $OpenBSD: contents,v 1.77 2015/01/12 17:10:38 deraadt Exp $
TopPart
OpenBSDminiroot
@@ -6,15 +6,6 @@ OpenBSDminiroot
OpenBSDfloppy
- floppyB{:--:}OSrev.fs Another MACHINE boot and installation floppy; this one
- features all the drivers not available in floppy{:--:}OSrev.fs,
- such as SCSI, RAID, Gigabit Ethernet, and such; see
- below.
-
- floppyC{:--:}OSrev.fs Another MACHINE boot and installation floppy; this one
- features most of the cardbus and PCMCIA drivers; see
- below.
-
pxeboot MACHINE-specific second-stage PXE bootstrap (for
network installs); see below.
@@ -43,7 +34,7 @@ OpenBSDcd
This file is included in the cd{:--:}OSrev.iso image, and is
provided as a convenience, but will rarely be needed.
-OpenBSDfloppydesc(three,Each,s)
+OpenBSDfloppydesc(single,The)
DistributionDescription(ten)
diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc
index 9503abe8de1..08635d99b9c 100644
--- a/etc/etc.i386/Makefile.inc
+++ b/etc/etc.i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.23 2014/03/07 22:50:31 tedu Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2015/01/12 17:10:38 deraadt Exp $
KERNELS += GENERIC.MP bsd.mp
@@ -7,6 +7,5 @@ bootblocks:
cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR}
-MDEXT= bsd.rd cd${OSrev}.iso floppy${OSrev}.fs floppyB${OSrev}.fs \
- floppyC${OSrev}.fs miniroot${OSrev}.fs \
+MDEXT= bsd.rd cd${OSrev}.iso floppy${OSrev}.fs miniroot${OSrev}.fs \
pxeboot cdboot cdbr
diff --git a/sys/arch/i386/compile/.cvsignore b/sys/arch/i386/compile/.cvsignore
index 07993a81a78..4741f3d9201 100644
--- a/sys/arch/i386/compile/.cvsignore
+++ b/sys/arch/i386/compile/.cvsignore
@@ -1,7 +1,4 @@
-DISKLESS
GENERIC
GENERIC.MP
RAMDISK
-RAMDISKB
-RAMDISKC
RAMDISK_CD
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 6275522138d..f1625123c78 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.187 2014/11/24 02:03:37 brad Exp $
+# $OpenBSD: RAMDISK,v 1.188 2015/01/12 17:10:38 deraadt Exp $
machine i386
maxusers 4
@@ -59,9 +59,22 @@ pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
pcic* at pci?
pcmcia* at pcic?
+xhci* at pci?
+ehci* at pci?
+uhci* at pci?
+ohci* at pci?
+usb* at xhci?
+usb* at ehci?
+usb* at uhci?
+usb* at ohci?
+uhub* at usb?
+umass* at uhub?
+uhidev* at uhub? # Human Interface Devices
+ukbd* at uhidev? # USB keyboard
+wskbd* at ukbd? mux 1
+
npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
-isapnp0 at isa?
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
@@ -75,7 +88,6 @@ wsdisplay* at pcdisplay?
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
com2 at isa? port 0x3e8 irq 5
-com* at isapnp?
scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
@@ -88,41 +100,26 @@ pciide* at pci? flags 0x0000
wdc0 at isa? port 0x1f0 irq 14 flags 0x00
wdc1 at isa? port 0x170 irq 15 flags 0x00
wdc* at pcmcia?
-wdc* at isapnp?
wd* at wdc? flags 0x0000
wd* at pciide? flags 0x0000
atapiscsi* at wdc?
atapiscsi* at pciide?
-we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series
-we1 at isa? port 0x300 iomem 0xcc000 irq 10 #
-we* at isapnp?
-ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card
-ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card
-ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet
-ne* at isapnp? # NE[12]000 PnP ethernet cards
-ep0 at isa? # 3C509 ethernet cards
-ep* at isa? # 3C509 ethernet cards
-le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
-ep* at isapnp? # 3C509 PnP ethernet cards
-le* at isapnp?
+#ahc0 at isa? # Adaptec 284x SCSI controllers
+#ahd* at pci? # Adaptec 79?? SCSI controllers
+mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface
+#ami* at pci? # AMI MegaRAID controllers
+#mfi* at pci? # LSI MegaRAID SAS controllers
+
de* at pci? # DC21X4X-based ethernet cards
fxp* at pci? # EtherExpress 10/100B ethernet cards
-ep* at pci? # 3C59x ethernet cards
ne* at pci? # NE2000-compat ethernet cards
ne* at pcmcia? # PCMCIA based NE2000 cards
-ep* at pcmcia? # PCMCIA based 3c5xx cards
-xl* at pci? # 3C9xx ethernet cards
rl* at pci? # Realtek 81[23]9 ethernet
-vr* at pci? # VIA Rhine ethernet
dc* at pci? # 21143, "tulip" clone ethernet
-sis* at pci? # SiS 900/7016 ethernet
em* at pci? # Intel Pro/1000 ethernet
re* at pci? # Realtek 8169/8169S/8110S
-vge* at pci? # VIA VT612x
-nfe* at pci? # NVIDIA nForce Ethernet
-wi* at pci? # WaveLAN IEEE 802.11DS
-wi* at pcmcia? # WaveLAN IEEE 802.11DS
+#bge* at pci? # Broadcom BCM570x (aka Tigon3)
exphy* at mii? # 3Com internal PHYs
inphy* at mii? # Intel 82555 PHYs
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
deleted file mode 100644
index cbff422ff18..00000000000
--- a/sys/arch/i386/conf/RAMDISKB
+++ /dev/null
@@ -1,122 +0,0 @@
-# $OpenBSD: RAMDISKB,v 1.130 2014/11/24 02:03:37 brad Exp $
-
-machine i386
-maxusers 4
-
-option TIMEZONE=0
-option DST=0
-option SMALL_KERNEL
-option NO_PROPOLICE
-option BOOT_CONFIG
-
-option RAMDISK_HOOKS
-option MINIROOTSIZE=3872
-
-option PCIVERBOSE
-option SCSITERSE
-
-option FFS
-option INET
-
-config bsd root on rd0a swap on rd0b and wd0b and sd0b
-
-mainbus0 at root
-
-acpi0 at bios?
-#acpitimer* at acpi?
-#acpihpet* at acpi?
-#acpiac* at acpi?
-#acpibat* at acpi?
-#acpibtn* at acpi?
-#acpicpu* at acpi?
-#acpiec* at acpi?
-acpimadt0 at acpi?
-acpiprt* at acpi?
-#acpitz* at acpi?
-
-cpu0 at mainbus?
-bios0 at mainbus0
-ioapic* at mainbus?
-apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
-pcibios0 at bios0 flags 0x0000
-
-isa0 at mainbus0
-isa0 at pcib?
-pci* at mainbus0
-
-pchb* at pci? # PCI-Host bridges
-ppb* at pci? # PCI-PCI bridges
-pci* at ppb?
-pci* at pchb?
-pcib* at pci? # PCI-ISA bridge
-geodesc* at pci? # Geode SC1100/SCx200 IAOC
-
-npx0 at isa? port 0xf0 irq 13 # math coprocessor
-isadma0 at isa?
-isapnp0 at isa?
-
-pckbc0 at isa? # PC keyboard controller
-pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd? mux 1
-vga0 at isa?
-vga* at pci?
-pcdisplay0 at isa? # CGA, MDA, EGA, HGA
-wsdisplay* at vga?
-wsdisplay* at pcdisplay?
-
-com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
-com1 at isa? port 0x2f8 irq 3
-com2 at isa? port 0x3e8 irq 5
-
-ahc0 at isa? # Adaptec 284x SCSI controllers
-ahd* at pci? # Adaptec 79?? SCSI controllers
-mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface
-ami* at pci? # AMI MegaRAID controllers
-mfi* at pci? # LSI MegaRAID SAS controllers
-
-scsibus* at scsi?
-sd* at scsibus? # SCSI disk drives
-
-fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers
-fd* at fdc?
-
-pciide* at pci? flags 0x0000
-wdc0 at isa? port 0x1f0 irq 14 flags 0x00
-wdc1 at isa? port 0x170 irq 15 flags 0x00
-wd* at wdc? flags 0x0000
-wd* at pciide? flags 0x0000
-atapiscsi* at wdc?
-atapiscsi* at pciide?
-
-de* at pci? # DC21X4X-based ethernet cards
-fxp* at pci? # EtherExpress 10/100B ethernet cards
-ep* at pci? # 3C59x ethernet cards
-vr* at pci? # VIA Rhine ethernet
-dc* at pci? # 21143, "tulip" clone ethernet
-skc* at pci? # SysKonnect GEnesis 984x
-sk* at skc? # each port of above
-em* at pci? # Intel Pro/1000 ethernet
-bge* at pci? # Broadcom BCM570x (aka Tigon3)
-re* at pci? # Realtek 8169/8169S/8110S
-vge* at pci? # VIA VT612x
-nfe* at pci? # NVIDIA nForce Ethernet
-
-inphy* at mii? # Intel 82555 PHYs
-iophy* at mii? # Intel 82553 PHYs
-icsphy* at mii? # ICS 1890 PHYs
-nsphy* at mii? # NS and compatible PHYs
-nsphyter* at mii? # NS and compatible 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
-rgephy* at mii? # Realtek 8169S/8110S PHY
-ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
-ukphy* at mii? # "unknown" PHYs
-
-pseudo-device loop 1
-pseudo-device bpfilter 1
-pseudo-device rd 1
-pseudo-device wsmux 2
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
deleted file mode 100644
index 86caa6b7360..00000000000
--- a/sys/arch/i386/conf/RAMDISKC
+++ /dev/null
@@ -1,111 +0,0 @@
-# $OpenBSD: RAMDISKC,v 1.112 2014/10/10 05:43:35 deraadt Exp $
-
-machine i386
-maxusers 4
-
-option TIMEZONE=0
-option DST=0
-option SMALL_KERNEL
-option NO_PROPOLICE
-option BOOT_CONFIG
-
-option RAMDISK_HOOKS
-option MINIROOTSIZE=3872
-
-option PCIVERBOSE
-option SCSITERSE
-
-option FFS
-option MSDOSFS
-option INET
-
-config bsd root on rd0a swap on rd0b and wd0b and sd0b
-
-mainbus0 at root
-
-acpi0 at bios?
-#acpitimer* at acpi?
-#acpihpet* at acpi?
-#acpiac* at acpi?
-#acpibat* at acpi?
-#acpibtn* at acpi?
-#acpicpu* at acpi?
-#acpiec* at acpi?
-acpimadt0 at acpi?
-acpiprt* at acpi?
-#acpitz* at acpi?
-
-cpu0 at mainbus?
-bios0 at mainbus0
-ioapic* at mainbus?
-apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1
-pcibios0 at bios0 flags 0x0000
-
-isa0 at mainbus0
-isa0 at pcib?
-pci* at mainbus0
-
-pchb* at pci? # PCI-Host bridges
-ppb* at pci? # PCI-PCI bridges
-pci* at ppb?
-pci* at pchb?
-pcib* at pci? # PCI-ISA bridge
-
-uhci* at pci?
-ohci* at pci?
-usb* at uhci?
-usb* at ohci?
-
-uhub* at usb?
-uhub* at uhub?
-umass* at uhub?
-uhidev* at uhub? # Human Interface Devices
-ukbd* at uhidev? # USB keyboard
-wskbd* at ukbd? mux 1
-
-npx0 at isa? port 0xf0 irq 13 # math coprocessor
-isadma0 at isa?
-
-pckbc0 at isa? # PC keyboard controller
-pckbd* at pckbc? # PC keyboard
-wskbd* at pckbd? mux 1
-vga0 at isa?
-vga* at pci?
-pcdisplay0 at isa? # CGA, MDA, EGA, HGA
-wsdisplay* at vga?
-wsdisplay* at pcdisplay?
-
-com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
-com1 at isa? port 0x2f8 irq 3
-com2 at isa? port 0x3e8 irq 5
-
-
-scsibus* at scsi?
-sd* at scsibus? # SCSI disk drives
-
-fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers
-fd* at fdc?
-
-pciide* at pci? flags 0x0000
-wdc0 at isa? port 0x1f0 irq 14 flags 0x00
-wdc1 at isa? port 0x170 irq 15 flags 0x00
-wd* at wdc? flags 0x0000
-wd* at pciide? flags 0x0000
-atapiscsi* at wdc?
-atapiscsi* at pciide?
-
-em* at pci? # Intel Pro/1000 ethernet
-re* at pci? # Realtek 8169/8169S/8110S
-ath* at pci? # Atheros AR5k (802.11a/b/g)
-
-inphy* at mii? # Intel 82555 PHYs
-iophy* at mii? # Intel 82553 PHYs
-icsphy* at mii? # ICS 1890 PHYs
-nsphy* at mii? # NS and compatible PHYs
-rgephy* at mii? # Realtek 8169S/8110S PHY
-ukphy* at mii? # "unknown" PHYs
-
-pseudo-device loop 1
-pseudo-device bpfilter 1
-pseudo-device rd 1
-pseudo-device wsmux 2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 13:34:55 +0000