diff options
author | Marco Peereboom <marco@cvs.openbsd.org> | 2007-03-19 03:02:10 +0000 |
---|---|---|
committer | Marco Peereboom <marco@cvs.openbsd.org> | 2007-03-19 03:02:10 +0000 |
commit | 0583d77423003d709b189011b4fa7a6d3422a41a (patch) | |
tree | 2fc3b955836fb9cd6c0bb95f63972901c1870bf8 /sys/arch/i386/conf | |
parent | 16bd16fa930635ce3f536fd1bad24fa8d840a117 (diff) |
Add a new device that provides a framework for IO manipulation. A very basic
implementation of a RAID 1 is included in this but it does not deal with
failures yet. Disabled in GENERIC.
Suggestions from and ok beck@ miod@ krw@ dlg@ deraadt@
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 | ||||
-rw-r--r-- | sys/arch/i386/conf/files.i386 | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 0ac16322c33..ff895dc9c44 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.549 2007/03/17 00:10:51 robert Exp $ +# $OpenBSD: GENERIC,v 1.550 2007/03/19 03:02:09 marco Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -50,6 +50,9 @@ pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose ipmi0 at mainbus? # IPMI esm0 at mainbus? # Dell Embedded Server Management +#softraid0 at mainbus? # Software RAID +#scsibus* at softraid? + isa0 at mainbus0 isa0 at pcib? isa0 at ichpcib? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 35aee08457f..9a344bbbac5 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.154 2007/02/20 21:15:01 tom Exp $ +# $OpenBSD: files.i386,v 1.155 2007/03/19 03:02:09 marco Exp $ # # new style config file for i386 architecture # @@ -415,6 +415,11 @@ include "../../../dev/acpi/files.acpi" file arch/i386/i386/acpi_machdep.c acpi # +# SOFTRAID +# +attach softraid at mainbus + +# # IPMI # attach ipmi at mainbus @@ -424,13 +429,9 @@ device esm attach esm at mainbus file arch/i386/i386/esm.c esm needs-flag - # # VESA # include "dev/vesa/files.vesa" - #include "dev/rasops/files.rasops" - - |