diff options
author | jake <jake@FreeBSD.org> | 2003-06-18 15:25:01 +0000 |
---|---|---|
committer | jake <jake@FreeBSD.org> | 2003-06-18 15:25:01 +0000 |
commit | fb686f341c75d03987fa2d1a6b82f9f01e641ffb (patch) | |
tree | 14eada896e1eb0848dea9958ce1c519faa57368b /sys | |
parent | d73da6e66edddf777cd6ff431168fd8fe19d5d1f (diff) | |
download | FreeBSD-src-fb686f341c75d03987fa2d1a6b82f9f01e641ffb.zip FreeBSD-src-fb686f341c75d03987fa2d1a6b82f9f01e641ffb.tar.gz |
Moved the syscons options, kbd options and DEV_SPLASH to the MI options
file.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/options | 33 | ||||
-rw-r--r-- | sys/conf/options.alpha | 33 | ||||
-rw-r--r-- | sys/conf/options.amd64 | 31 | ||||
-rw-r--r-- | sys/conf/options.i386 | 31 | ||||
-rw-r--r-- | sys/conf/options.ia64 | 32 | ||||
-rw-r--r-- | sys/conf/options.pc98 | 31 |
6 files changed, 33 insertions, 158 deletions
diff --git a/sys/conf/options b/sys/conf/options index ee895c9..51955bd 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -589,6 +589,7 @@ NDEVFSOVERFLOW opt_devfs.h DEV_ISA opt_isa.h DEV_MCA opt_mca.h DEV_BPF opt_bpf.h +DEV_SPLASH opt_splash.h # ed driver ED_NO_MIIBUS opt_ed.h @@ -605,3 +606,35 @@ UBSEC_RNDTEST opt_ubsec.h # options for hifn driver HIFN_DEBUG opt_hifn.h HIFN_RNDTEST opt_hifn.h + +# syscons options +MAXCONS opt_syscons.h +SC_ALT_MOUSE_IMAGE opt_syscons.h +SC_CUT_SPACES2TABS opt_syscons.h +SC_CUT_SEPCHARS opt_syscons.h +SC_DEBUG_LEVEL opt_syscons.h +SC_DFLT_FONT opt_syscons.h +SC_DISABLE_DDBKEY opt_syscons.h +SC_DISABLE_REBOOT opt_syscons.h +SC_HISTORY_SIZE opt_syscons.h +SC_KERNEL_CONS_ATTR opt_syscons.h +SC_KERNEL_CONS_REV_ATTR opt_syscons.h +SC_MOUSE_CHAR opt_syscons.h +SC_NO_CUTPASTE opt_syscons.h +SC_NO_FONT_LOADING opt_syscons.h +SC_NO_HISTORY opt_syscons.h +SC_NO_SYSMOUSE opt_syscons.h +SC_NORM_ATTR opt_syscons.h +SC_NORM_REV_ATTR opt_syscons.h +SC_PIXEL_MODE opt_syscons.h +SC_RENDER_DEBUG opt_syscons.h +SC_TWOBUTTON_MOUSE opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h + +# kbd options +KBD_DISABLE_KEYMAP_LOAD opt_kbd.h +KBD_INSTALL_CDEV opt_kbd.h +KBD_MAXRETRY opt_kbd.h +KBD_MAXWAIT opt_kbd.h +KBD_RESETDELAY opt_kbd.h +KBDIO_DEBUG opt_kbd.h diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha index dac238c..3f46d2c 100644 --- a/sys/conf/options.alpha +++ b/sys/conf/options.alpha @@ -21,28 +21,6 @@ MAXMEM PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h DEV_SC VGA_ALT_SEQACCESS opt_vga.h @@ -67,14 +45,6 @@ PSM_DEBUG opt_psm.h # Atkbd options ATKBD_DFLT_KEYMAP opt_atkbd.h -# Kbd options -KBD_DISABLE_KEYMAP_LOAD opt_kbd.h -KBD_INSTALL_CDEV opt_kbd.h -KBD_MAXRETRY opt_kbd.h -KBD_MAXWAIT opt_kbd.h -KBD_RESETDELAY opt_kbd.h -KBDIO_DEBUG opt_kbd.h - # Clock options CLK_USE_I8254_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h @@ -84,6 +54,3 @@ TIMER_FREQ opt_clock.h # (see src/sys/conf/options). COMPAT_LINUX opt_dontuse.h COMPAT_OSF1 opt_dontuse.h - -# Device options -DEV_SPLASH opt_splash.h diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index f222951..af1adb7 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -10,30 +10,6 @@ KVA_PAGES opt_global.h CLK_CALIBRATION_LOOP opt_clock.h TIMER_FREQ opt_clock.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h -DEV_SPLASH opt_splash.h - VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h VGA_NO_FONT_LOADING opt_vga.h @@ -43,13 +19,6 @@ VGA_WIDTH90 opt_vga.h ATKBD_DFLT_KEYMAP opt_atkbd.h -KBD_DISABLE_KEYMAP_LOAD opt_kbd.h -KBD_INSTALL_CDEV opt_kbd.h -KBD_MAXRETRY opt_kbd.h -KBD_MAXWAIT opt_kbd.h -KBD_RESETDELAY opt_kbd.h -KBDIO_DEBUG opt_kbd.h - # ------------------------------- # EOF # ------------------------------- diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 3de1be2..9647884 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -79,29 +79,6 @@ I486_CPU opt_global.h I586_CPU opt_global.h I686_CPU opt_global.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h VGA_NO_FONT_LOADING opt_vga.h @@ -118,13 +95,6 @@ PSM_DEBUG opt_psm.h ATKBD_DFLT_KEYMAP opt_atkbd.h -KBD_DISABLE_KEYMAP_LOAD opt_kbd.h -KBD_INSTALL_CDEV opt_kbd.h -KBD_MAXRETRY opt_kbd.h -KBD_MAXWAIT opt_kbd.h -KBD_RESETDELAY opt_kbd.h -KBDIO_DEBUG opt_kbd.h - EISA_SLOTS opt_eisa.h # pcvt(4) has a bunch of options @@ -182,7 +152,6 @@ IPR_LOG opt_i4b.h # Device options DEV_NPX opt_npx.h -DEV_SPLASH opt_splash.h # ------------------------------- # EOF diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64 index d035871..0df55e2 100644 --- a/sys/conf/options.ia64 +++ b/sys/conf/options.ia64 @@ -13,29 +13,6 @@ PAGE_SIZE_16K opt_global.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h VGA_NO_FONT_LOADING opt_vga.h @@ -50,14 +27,6 @@ PSM_DEBUG opt_psm.h # Atkbd options ATKBD_DFLT_KEYMAP opt_atkbd.h -# Kbd options -KBD_DISABLE_KEYMAP_LOAD opt_kbd.h -KBD_INSTALL_CDEV opt_kbd.h -KBD_MAXRETRY opt_kbd.h -KBD_MAXWAIT opt_kbd.h -KBD_RESETDELAY opt_kbd.h -KBDIO_DEBUG opt_kbd.h - # Clock options CLK_USE_I8254_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h @@ -68,5 +37,4 @@ SKI_ROOT_FILESYSTEM opt_ski.h SSC_NSECT opt_ski.h # Device options -DEV_SPLASH opt_splash.h DEV_ACPI opt_acpi.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index f502933..454f5fc 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -70,38 +70,8 @@ I486_CPU opt_global.h I586_CPU opt_global.h I686_CPU opt_global.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - GDC -KBD_DISABLE_KEYMAP_LOAD opt_kbd.h -KBD_INSTALL_CDEV opt_kbd.h -KBD_MAXRETRY opt_kbd.h -KBD_MAXWAIT opt_kbd.h -KBD_RESETDELAY opt_kbd.h -KBDIO_DEBUG opt_kbd.h - # Video spigot SPIGOT_UNSECURE opt_spigot.h @@ -137,7 +107,6 @@ LINE30 opt_syscons.h # Device options DEV_NPX opt_npx.h -DEV_SPLASH opt_splash.h DEV_MECIA opt_mecia.h # ------------------------------- |