Automatically depend on x86emu when vesa or dpms is being built into

kernel.  With this change the user no longer need to remember building
this option.

Submitted by:	swell.k at gmail.com
This commit is contained in:
Xin LI 2009-09-21 07:08:20 +00:00
parent 372c733759
commit 6abad12dfe
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=197380
5 changed files with 39 additions and 10 deletions

View File

@ -154,7 +154,7 @@ options AGP_DEBUG
#####################################################################
# HARDWARE DEVICE CONFIGURATION
# To include support for VGA VESA video modes (depends on X86EMU)
# To include support for VGA VESA video modes
options VESA
# Turn on extra debugging checks and output for VESA support.

View File

@ -841,6 +841,35 @@ dev/drm/mga_irq.c optional mgadrm
dev/drm/mga_state.c optional mgadrm \
compile-with "${NORMAL_C} -finline-limit=13500"
dev/drm/mga_warp.c optional mgadrm
dev/drm/nouveau_dma.c optional nouveaudrm
dev/drm/nouveau_drv.c optional nouveaudrm
dev/drm/nouveau_fence.c optional nouveaudrm
dev/drm/nouveau_fifo.c optional nouveaudrm
dev/drm/nouveau_irq.c optional nouveaudrm
dev/drm/nouveau_mem.c optional nouveaudrm
dev/drm/nouveau_notifier.c optional nouveaudrm
dev/drm/nouveau_object.c optional nouveaudrm
dev/drm/nouveau_sgdma.c optional nouveaudrm
dev/drm/nouveau_state.c optional nouveaudrm
dev/drm/nouveau_swmthd.c optional nouveaudrm
dev/drm/nv04_fb.c optional nouveaudrm
dev/drm/nv04_fifo.c optional nouveaudrm
dev/drm/nv04_graph.c optional nouveaudrm
dev/drm/nv04_instmem.c optional nouveaudrm
dev/drm/nv04_mc.c optional nouveaudrm
dev/drm/nv04_timer.c optional nouveaudrm
dev/drm/nv10_fb.c optional nouveaudrm
dev/drm/nv10_fifo.c optional nouveaudrm
dev/drm/nv10_graph.c optional nouveaudrm
dev/drm/nv20_graph.c optional nouveaudrm
dev/drm/nv40_fb.c optional nouveaudrm
dev/drm/nv40_fifo.c optional nouveaudrm
dev/drm/nv40_graph.c optional nouveaudrm
dev/drm/nv40_mc.c optional nouveaudrm
dev/drm/nv50_fifo.c optional nouveaudrm
dev/drm/nv50_graph.c optional nouveaudrm
dev/drm/nv50_instmem.c optional nouveaudrm
dev/drm/nv50_mc.c optional nouveaudrm
dev/drm/r128_cce.c optional r128drm
dev/drm/r128_drv.c optional r128drm
dev/drm/r128_irq.c optional r128drm
@ -2828,6 +2857,6 @@ dev/xen/netfront/netfront.c optional xen | xenhvm
dev/xen/xenpci/xenpci.c optional xenpci
dev/xen/xenpci/evtchn.c optional xenpci
dev/xen/xenpci/machine_reboot.c optional xenpci
contrib/x86emu/x86emu.c optional x86emu
contrib/x86emu/x86emu_util.c optional x86emu
contrib/x86emu/x86emu.c optional x86emu | dpms | vesa
contrib/x86emu/x86emu_util.c optional x86emu | dpms | vesa

View File

@ -162,7 +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
dev/dpms/dpms.c optional dpms
# 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
@ -171,7 +171,7 @@ 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/s3_pci.c optional s3pci
dev/fb/vesa.c optional vga vesa x86emu
dev/fb/vesa.c optional vga vesa
dev/fb/vga.c optional vga
dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
@ -220,7 +220,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/scvesactl.c optional sc vga vesa
dev/syscons/scvgarndr.c optional sc vga
dev/syscons/scvtb.c optional sc
dev/uart/uart_cpu_amd64.c optional uart

View File

@ -150,7 +150,7 @@ 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/dpms/dpms.c optional dpms
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
@ -158,7 +158,7 @@ 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/s3_pci.c optional s3pci
dev/fb/vesa.c optional vga vesa x86emu
dev/fb/vesa.c optional vga vesa
dev/fb/vga.c optional vga
dev/fdc/fdc.c optional fdc
dev/fdc/fdc_acpi.c optional fdc
@ -220,7 +220,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/scvesactl.c optional sc vga vesa
dev/syscons/scvgarndr.c optional sc vga
dev/syscons/scvtb.c optional sc
dev/uart/uart_cpu_i386.c optional uart

View File

@ -353,7 +353,7 @@ options AGP_DEBUG
#####################################################################
# HARDWARE DEVICE CONFIGURATION
# To include support for VGA VESA video modes (depends on X86EMU)
# To include support for VGA VESA video modes
options VESA
# Turn on extra debugging checks and output for VESA support.