diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-13 13:53:51 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-13 13:53:51 +0000 |
| commit | c8bbebfc17c8bb1c3bcfaa89aaa1f8f3586e061b (patch) | |
| tree | 4c47917947e9c106b7c40996bbcf0ed6f261cdd9 /sys/arch/i386/conf | |
| parent | 9c7e0fea63c2ab02df4f18e020bf1813e4896cb3 (diff) | |
Turn mpbios into a real device, such that people can disable it on crappy
BIOSes.
ok deraadt@ (for the amd64 bit, or the i386 bit, can't remember which)
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 62aca4ed821..c5d9ff0663c 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.647 2009/01/06 23:03:16 jasper Exp $ +# $OpenBSD: GENERIC,v 1.648 2009/01/13 13:53:50 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -43,6 +43,7 @@ bios0 at mainbus0 ioapic* at mainbus? apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 acpi0 at bios? +mpbios0 at bios0 pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose ipmi0 at mainbus? disable # IPMI #vmt0 at mainbus? # VMware Tools diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 158d90afc46..78ed4b5beec 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.166 2009/01/06 23:03:16 jasper Exp $ +# $OpenBSD: RAMDISK,v 1.167 2009/01/13 13:53:50 kettenis Exp $ machine i386 # architecture, used by config; REQUIRED @@ -50,6 +50,7 @@ bios0 at mainbus0 ioapic* at mainbus? apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG +mpbios0 at bios0 pcibios0 at bios0 flags 0x0000 isa0 at mainbus0 diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index fd11d1b184b..89568b35eee 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.186 2008/12/04 15:24:18 oga Exp $ +# $OpenBSD: files.i386,v 1.187 2009/01/13 13:53:50 kettenis Exp $ # # new style config file for i386 architecture # @@ -304,6 +304,8 @@ file arch/i386/i386/acpiapm.c # Intel SMP specification 1.4 define mpbios +device mpbios +attach mpbios at bios file arch/i386/i386/mpbios.c mpbios needs-flag file arch/i386/i386/mpbios_intr_fixup.c mpbios & pci |