summaryrefslogtreecommitdiffstats
path: root/sys/conf/options.pc98
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1996-10-23 07:25:35 +0000
committerasami <asami@FreeBSD.org>1996-10-23 07:25:35 +0000
commitda2957207b1d3dec86dcf8334bc11b75a9113b84 (patch)
tree59a2eda3deec512d26d8ccb3951fd2db2f76dab6 /sys/conf/options.pc98
parent326b6b4bd810b639513bd0adabaeed761886bd77 (diff)
downloadFreeBSD-src-da2957207b1d3dec86dcf8334bc11b75a9113b84.zip
FreeBSD-src-da2957207b1d3dec86dcf8334bc11b75a9113b84.tar.gz
Another round of merge.
(1) Bug fix (pass boot drive): pc98/boot/biosboot/boot2.S (2) Delete code for unsupported high-resolution modes and move old Epson notebook code to epsonio.h: pc98/boot/biosboot/io.c pc98/i386/vm_machdep.c pc98/pc98/fd.c pc98/pc98/pc98.c pc98/pc98/pc98.h pc98/pc98/epsonio.h (new) (3) Change aic driver so that PCMCIA cards (I/O port same as PC/AT) and PC-9801-100 cards can be selected with a flag in kernel config file: pc98/pc98/aic6360.c pc98/pc98/aic_98.h (new) (4) Fix wcd entry (it was broken). Delete mcd, it doesn't work on 98. Change aic entry according to above: pc98/conf/GENERIC98 (5) Move pc98_machdep.c to top of files in pc98/pc98: pc98/conf/files.pc98 (6) Delete empty lines: pc98/i386/locore.s (7) Fix (it didn't work if I586 was specified): pc98/pc98/clock.c (8) Staticize: pc98/pc98/pc98_machdep.c (9) Enable workaround for Cyrix bug for 5x86 also: pc98/i386/machdep.c pc98/i386/trap.c All the above deletes this file too: pc98/i386/pmap.c (phew!) Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/conf/options.pc98')
-rw-r--r--sys/conf/options.pc9813
1 files changed, 12 insertions, 1 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 9a589f3..4374f02 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.4 1996/09/12 11:09:21 asami Exp $
+# $Id: options.pc98,v 1.5 1996/10/09 21:45:47 asami Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
@@ -18,6 +18,8 @@ COMCONSOLE opt_comconsole.h
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
DSI_SOFT_MODEM opt_sio.h
+I586_CTR_GUPROF opt_i586_guprof.h
+I586_PMC_GUPROF opt_i586_guprof.h
FAT_CURSOR opt_pcvt.h
PCVT_FREEBSD opt_pcvt.h
PCVT_SCANSET opt_pcvt.h
@@ -30,6 +32,15 @@ CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
CLK_USE_I586_CALIBRATION opt_clock.h
+I386_CPU opt_cpu.h
+I486_CPU opt_cpu.h
+I586_CPU opt_cpu.h
+I686_CPU opt_cpu.h
+
+I586_FAST_BCOPY opt_temporary.h
+I586_OPTIMIZED_BCOPY opt_temporary.h
+I586_OPTIMIZED_BZERO opt_temporary.h
+
SC_KBD_PROBE_WORKS opt_syscons.h
SC_SPLASH_SCREEN opt_syscons.h
MAXCONS opt_syscons.h
OpenPOWER on IntegriCloud