diff options
| author | delphij <delphij@FreeBSD.org> | 2009-09-21 23:58:29 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-09-21 23:58:29 +0000 |
| commit | 5cab0133e2de0c82e494d2822fa55fd29b75a5fa (patch) | |
| tree | efa492c518cadd85b04ece6b04f9fe95c6a0fbf4 | |
| parent | aeed8258a908bdadfeeab09b58aad3a38180ba33 (diff) | |
| download | FreeBSD-src-5cab0133e2de0c82e494d2822fa55fd29b75a5fa.zip FreeBSD-src-5cab0133e2de0c82e494d2822fa55fd29b75a5fa.tar.gz | |
Build x86bios only for i386/amd64 for now. More work is required
to make these functional on other architectures, and the current
code breaks sparc64 and powerpc.
Spotted by: tinderbox via des
| -rw-r--r-- | sys/amd64/conf/NOTES | 5 | ||||
| -rw-r--r-- | sys/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 3 | ||||
| -rw-r--r-- | sys/modules/Makefile | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 722217a..f3619cf 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -160,6 +160,11 @@ options VESA # Turn on extra debugging checks and output for VESA support. options VESA_DEBUG +device dpms # DPMS suspend & resume via VESA BIOS + +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # Optional devices: # diff --git a/sys/conf/NOTES b/sys/conf/NOTES index eb027ea..1cba42f 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2757,5 +2757,3 @@ options AAC_DEBUG # Debugging levels: options BROOKTREE_ALLOC_PAGES=(217*4+1) options MAXFILES=999 -# x86 real mode emulator -options X86BIOS diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 54581b5..594c43a 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -361,6 +361,9 @@ options VESA_DEBUG device dpms # DPMS suspend & resume via VESA BIOS +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # The Numeric Processing eXtension driver. This is non-optional. device npx diff --git a/sys/modules/Makefile b/sys/modules/Makefile index b54314e..49d8860 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -298,7 +298,7 @@ SUBDIR= ${_3dfx} \ wlan_xauth \ ${_wpi} \ ${_wpifw} \ - x86bios \ + ${_x86bios} \ ${_xe} \ xfs \ xl \ @@ -456,6 +456,7 @@ _padlock= padlock _s3= s3 _twa= twa _vesa= vesa +_x86bios= x86bios .elif ${MACHINE} == "pc98" _canbepm= canbepm _canbus= canbus @@ -539,6 +540,7 @@ _sppp= sppp _tmpfs= tmpfs _twa= twa _vesa= vesa +_x86bios= x86bios _wi= wi _wpi= wpi _wpifw= wpifw |
