diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2002-08-09 06:07:33 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-08-09 06:07:33 +0000 |
| commit | ac0399358527a83bef0c88e337cc51957673a894 (patch) | |
| tree | 48bfd2ae4acf163f980466bca782deb3ce35239c | |
| parent | 82d9ad331ac0a07c584b40ac3fb32498467dd9a5 (diff) | |
Notes
| -rw-r--r-- | share/man/man5/device.hints.5 | 5 | ||||
| -rw-r--r-- | sys/boot/common/loader.8 | 4 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/i386_module.c | 8 |
3 files changed, 17 insertions, 0 deletions
diff --git a/share/man/man5/device.hints.5 b/share/man/man5/device.hints.5 index f47645562be2f..3bfe2d498d168 100644 --- a/share/man/man5/device.hints.5 +++ b/share/man/man5/device.hints.5 @@ -142,6 +142,11 @@ hint.sio.0.port="0x3F8" hint.sio.0.flags="0x10" hint.sio.0.irq="4" .Ed + +The following example disables the ACPI driver +.Bd -literal -offset indent +hint.acpi.0.disable="1" +.Ed .\" .Pp .\" A control variable may look like: .\" .Pp diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 42131a6bf99f2..ecdc688dfb5ee 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -310,6 +310,10 @@ While some of these may require a value, others define behavior just by being set. These are described below. .Bl -tag -width bootfile +.It Va acpi_load +Unset this to disable automatic loading of the ACPI module. +See also hint.acpi.0.disable in +.Xr device.hints 5 . .It Va autoboot_delay Number of seconds .Ic autoboot diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c index a51a4885c9282..5c29aee00d344 100644 --- a/sys/boot/i386/libi386/i386_module.c +++ b/sys/boot/i386/libi386/i386_module.c @@ -47,5 +47,13 @@ i386_autoload(void) /* XXX use PnP to locate stuff here */ + /* autoload ACPI support */ + /* XXX should be in 4th keyed off acpi_load */ + if ((getenv("acpi_load") && !getenv("hint.acpi.0.disable"))) { + error = mod_load("acpi", NULL, 0, NULL); + if (error != 0) + printf("ACPI autoload failed - %s\n", strerror(error)); + } + return(0); } |