diff options
| author | delphij <delphij@FreeBSD.org> | 2009-09-09 09:50:31 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-09-09 09:50:31 +0000 |
| commit | 49000890a8d8e7ddc853db25ceb72d6c8dcc670b (patch) | |
| tree | 7ca44f508d1d8e6e2d1eaa8e13908bbb1ecaedb5 /sys/conf | |
| parent | 9d2fadbd2b45ba60a14fb37bd8671e217ded5386 (diff) | |
| download | FreeBSD-src-49000890a8d8e7ddc853db25ceb72d6c8dcc670b.zip FreeBSD-src-49000890a8d8e7ddc853db25ceb72d6c8dcc670b.tar.gz | |
- Teach vesa(4) and dpms(4) about x86emu. [1]
- Add vesa kernel options for amd64.
- Connect libvgl library and splash kernel modules to amd64 build.
- Connect manual page dpms(4) to amd64 build.
- Remove old vesa/dpms files.
Submitted by: paradox <ddkprog yahoo com> [1], swell k at gmail.com
(with some minor tweaks)
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 3 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/conf/options.amd64 | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index efd76c0..01f5355 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -162,6 +162,7 @@ dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc dev/coretemp/coretemp.c optional coretemp dev/cpuctl/cpuctl.c optional cpuctl +dev/dpms/dpms.c optional dpms x86emu # There are no systems with isa slots, so all ed isa entries should go.. dev/ed/if_ed_3c503.c optional ed isa ed_3c503 dev/ed/if_ed_isa.c optional ed isa @@ -169,6 +170,7 @@ dev/ed/if_ed_wd80x3.c optional ed isa dev/ed/if_ed_hpp.c optional ed isa ed_hpp dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb | vga +dev/fb/vesa.c optional vga vesa x86emu dev/fb/vga.c optional vga dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis @@ -217,6 +219,7 @@ dev/sio/sio_puc.c optional sio puc dev/speaker/spkr.c optional speaker dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/scterm-teken.c optional sc +dev/syscons/scvesactl.c optional sc vga vesa x86emu dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 17cd70e..0a16cee 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -150,12 +150,14 @@ dev/ctau/if_ct.c optional ctau dev/cx/csigma.c optional cx dev/cx/cxddk.c optional cx dev/cx/if_cx.c optional cx +dev/dpms/dpms.c optional dpms x86emu dev/ed/if_ed_3c503.c optional ed isa ed_3c503 dev/ed/if_ed_isa.c optional ed isa dev/ed/if_ed_wd80x3.c optional ed isa dev/ed/if_ed_hpp.c optional ed isa ed_hpp dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb | vga +dev/fb/vesa.c optional vga vesa x86emu dev/fb/vga.c optional vga dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc @@ -217,7 +219,7 @@ dev/sio/sio_puc.c optional sio puc dev/speaker/spkr.c optional speaker dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/scterm-teken.c optional sc -dev/syscons/scvesactl.c optional sc vga vesa +dev/syscons/scvesactl.c optional sc vga vesa x86emu dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_i386.c optional uart @@ -329,7 +331,6 @@ i386/isa/clock.c optional native i386/xen/clock.c optional xen i386/xen/xen_clock_util.c optional xen i386/xen/xen_rtc.c optional xen -i386/isa/dpms.c optional dpms i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -339,7 +340,6 @@ i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spic.c optional spic -i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index beb97ed..5617da4 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -37,6 +37,9 @@ VGA_NO_MODE_CHANGE opt_vga.h VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h +VESA +VESA_DEBUG opt_vesa.h + # AGP debugging support AGP_DEBUG opt_agp.h |
