diff options
author | asami <asami@FreeBSD.org> | 1996-09-12 11:12:18 +0000 |
---|---|---|
committer | asami <asami@FreeBSD.org> | 1996-09-12 11:12:18 +0000 |
commit | eb29d43f47d2764ad43636b3330ead07bc46bd57 (patch) | |
tree | 7a5dd9f80c049a86290c39b23a26fb62a527daa9 /sys/pc98/conf | |
parent | 0db650cebc177b2f5bd89b47d0ede89ccbef2bfe (diff) | |
download | FreeBSD-src-eb29d43f47d2764ad43636b3330ead07bc46bd57.zip FreeBSD-src-eb29d43f47d2764ad43636b3330ead07bc46bd57.tar.gz |
Another round of merge/update.
(1) Add PC98 support to apm_bios.h and ns16550.h, remove pc98/pc98/ic
(2) Move PC98 specific code out of cpufunc.h (to pc98.h)
(3) Let the boot subtrees look more alike
Submitted by: The FreeBSD(98) Development Team
<freebsd98-hackers@jp.freebsd.org>
Diffstat (limited to 'sys/pc98/conf')
-rw-r--r-- | sys/pc98/conf/GENERIC | 4 | ||||
-rw-r--r-- | sys/pc98/conf/GENERIC98 | 4 | ||||
-rw-r--r-- | sys/pc98/conf/files.pc98 | 7 | ||||
-rw-r--r-- | sys/pc98/conf/options.pc98 | 11 |
4 files changed, 18 insertions, 8 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 5fedd9c..d8d3024 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC98,v 1.3 1996/08/31 15:06:28 asami Exp $ +# $Id: GENERIC98,v 1.4 1996/09/07 02:13:23 asami Exp $ # GENERIC98 -- Generic PC98 machine with WD/SBIC55 disks @@ -38,6 +38,8 @@ options SYSVSEM options SYSVMSG options UCONSOLE #Allow users to grab the console options FAILSAFE #Be conservative +options USERCONFIG #boot -c editor +options VISUAL_USERCONFIG #visual boot -c editor options "MAXCONS=4" #4 virtual consoles options BOUNCE_BUFFERS #include support for DMA bounce buffers options EPSON_BOUNCEDMA #use bounce buufer for 15-16M diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98 index 5fedd9c..d8d3024 100644 --- a/sys/pc98/conf/GENERIC98 +++ b/sys/pc98/conf/GENERIC98 @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC98,v 1.3 1996/08/31 15:06:28 asami Exp $ +# $Id: GENERIC98,v 1.4 1996/09/07 02:13:23 asami Exp $ # GENERIC98 -- Generic PC98 machine with WD/SBIC55 disks @@ -38,6 +38,8 @@ options SYSVSEM options SYSVMSG options UCONSOLE #Allow users to grab the console options FAILSAFE #Be conservative +options USERCONFIG #boot -c editor +options VISUAL_USERCONFIG #visual boot -c editor options "MAXCONS=4" #4 virtual consoles options BOUNCE_BUFFERS #include support for DMA bounce buffers options EPSON_BOUNCEDMA #use bounce buufer for 15-16M diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98 index fb7d0d4..1d02c57 100644 --- a/sys/pc98/conf/files.pc98 +++ b/sys/pc98/conf/files.pc98 @@ -1,8 +1,9 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# modified for PC-9801 after: -# $Id: files.pc98,v 1.5 1996/09/04 09:52:08 asami Exp $ +# modified for PC-9801 +# +# $Id: files.i386,v 1.140 1996/09/11 19:53:30 phk Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ @@ -60,7 +61,7 @@ i386/i386/support.s standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard pc98/i386/trap.c standard -pc98/i386/userconfig.c standard +pc98/i386/userconfig.c optional userconfig pc98/i386/vm_machdep.c standard i386/ibcs2/ibcs2_fcntl.c optional ibcs2 i386/ibcs2/ibcs2_stat.c optional ibcs2 diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98 index ebe3f3b..98c7223 100644 --- a/sys/pc98/conf/options.pc98 +++ b/sys/pc98/conf/options.pc98 @@ -1,4 +1,4 @@ -# $Id: options.pc98,v 1.2 1996/07/23 07:45:51 asami Exp $ +# $Id: options.pc98,v 1.3 1996/09/10 09:37:14 asami Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -9,7 +9,6 @@ COMPAT_LINUX opt_dontuse.h SHOW_BUSYBUFS opt_machdep.h PANIC_REBOOT_WAIT_TIME opt_machdep.h -LARGEMEM opt_machdep.h MAXMEM opt_machdep.h PERFMON opt_perfmon.h AUTO_EOI_1 opt_auto_eoi.h @@ -28,7 +27,13 @@ CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h CLK_USE_I586_CALIBRATION opt_clock.h -SC_KEYBOARD_PROBE_WORKS opt_syscons.h +SC_KBD_PROBE_WORKS opt_syscons.h +MAXCONS opt_syscons.h +SLOW_VGA opt_syscons.h +XT_KEYBOARD opt_syscons.h ATAPI opt_atapi.h ATAPI_STATIC opt_atapi.h + +USERCONFIG opt_userconfig.h +VISUAL_USERCONFIG opt_userconfig.h |