diff options
author | asami <asami@FreeBSD.org> | 1996-10-23 07:25:35 +0000 |
---|---|---|
committer | asami <asami@FreeBSD.org> | 1996-10-23 07:25:35 +0000 |
commit | da2957207b1d3dec86dcf8334bc11b75a9113b84 (patch) | |
tree | 59a2eda3deec512d26d8ccb3951fd2db2f76dab6 /sys/conf/Makefile.pc98 | |
parent | 326b6b4bd810b639513bd0adabaeed761886bd77 (diff) | |
download | FreeBSD-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/Makefile.pc98')
-rw-r--r-- | sys/conf/Makefile.pc98 | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 03e5ac7..335b654 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.5 1996/09/07 02:13:25 asami Exp $ +# $Id: Makefile.pc98,v 1.6 1996/10/09 21:45:45 asami Exp $ # # Makefile for FreeBSD # @@ -29,16 +29,6 @@ S= ../.. PC98= ${S}/pc98 I386= ${S}/i386 -CWARNFLAGS?= -W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit \ - -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes \ - -Winline -Wunused -Wpointer-arith -# -# The following flags are next up for working on: -# -Wall -# -# When working on removing warnings from code, the `-Werror' flag should be -# of material assistance. -# COPTFLAGS?=-O INCLUDES= -nostdinc -I- -I. -I$S # This hack is to allow kernel compiles to succeed on machines w/out srcdist @@ -190,6 +180,8 @@ vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src sh $S/kern/vnode_if.sh $S/kern/vnode_if.src +.include <bsd.kern.mk> + %RULES # DO NOT DELETE THIS LINE -- make depend uses it |