This commit was manufactured by cvs2svn to create tagrelease/3.0.0

'RELENG_3_0_0_RELEASE'.

8 files changed, 48 insertions, 40 deletions

diff --git a/sys/pc98/boot/Makefile.inc b/sys/pc98/boot/Makefile.inc
index 88916943ec96..c02d4d7980f0 100644
--- a/sys/pc98/boot/Makefile.inc
+++ b/sys/pc98/boot/Makefile.inc
@@ -1,7 +1,5 @@
-#	$Id: Makefile.inc,v 1.3 1998/03/14 02:33:54 kato Exp $
+#	$Id: Makefile.inc,v 1.2 1998/03/14 02:29:24 kato Exp $
 
-BINDIR?=	/usr/mdec
-CFLAGS+=	-aout
 .if exists(${.CURDIR}/../../../../include)
 CFLAGS+=	-nostdinc -I${.CURDIR}/../../../../include
 .endif
diff --git a/sys/pc98/boot/biosboot/Makefile b/sys/pc98/boot/biosboot/Makefile
index 3a2640c950d3..cef96e0f6c15 100644
--- a/sys/pc98/boot/biosboot/Makefile
+++ b/sys/pc98/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.21 1999/01/03 05:03:46 kato Exp $
+#	$Id: Makefile,v 1.18 1998/05/28 13:46:04 kato Exp $
 #
 
 PROG=	boot
@@ -6,6 +6,7 @@ PROG=	boot
 SRCS=	start.S table.c boot2.S boot.c asm.S bios.S serial.S
 SRCS+=	probe_keyboard.c io.c disk.c sys.c
 
+BINDIR=		/usr/mdec
 BINMODE=	444
 CFLAGS=		-O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
 		-mno-486 \
@@ -15,8 +16,7 @@ CFLAGS+=	${CWARNFLAGS}
 
 # By default, if a serial port is going to be used as console, use COM1
 # (aka /dev/ttyd0).
-#BOOT_COMCONSOLE_PORT?=0x30
-BOOT_COMCONSOLE_PORT?=0x238
+BOOT_COMCONSOLE_PORT?=0x30
 BOOT_COMCONSOLE_CLK?=16
 BOOT_COMCONSOLE_MODE=0x0c
 CFLAGS+=	-DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
@@ -24,8 +24,8 @@ CFLAGS+=	-DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
 		-DCOMCONSOLE_MODE=${BOOT_COMCONSOLE_MODE}
 
 # feature not implemented
-BOOT_COMCONSOLE_SPEED?=9600
-CFLAGS+=	-DCONSPEED=${BOOT_COMCONSOLE_SPEED}
+# BOOT_COMCONSOLE_SPEED?=9600
+# CFLAGS+=	-DCONSPEED=${BOOT_COMCONSOLE_SPEED}
 
 # Enable code to take the default boot string from a fixed location on the
 # disk.  See nextboot(8) and README.386BSD for more info.
@@ -64,8 +64,8 @@ BOOTSTACK=	0xFFF0
 
 boot.strip:	boot
 	cp -p boot boot.strip
-	strip -aout boot.strip
-	size -aout boot.strip
+	strip boot.strip
+	size boot.strip
 
 boot.nohdr:	boot.strip
 	dd if=boot.strip of=boot.nohdr ibs=32 skip=1 obs=1024b
@@ -86,11 +86,19 @@ boot2:		boot.nohdr
 all:		boot1 boot2
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		boot1 boot2 ${DESTDIR}${BINDIR}/
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
+		boot1 ${DESTDIR}${BINDIR}/boot1
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
+		boot2 ${DESTDIR}${BINDIR}/boot2
+	for i in da fd wd od vn wfd ; do \
+		( cd ${DESTDIR}${BINDIR} ; \
+		rm -f boot$${i} $${i}boot ; \
+		ln -s boot1 $${i}boot ; \
+		ln -s boot2 boot$${i} ; ) \
+	done
 
 install-boothelp:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
 		${.CURDIR}/boot.help ${DESTDIR}/
 
 .include <bsd.kern.mk>
diff --git a/sys/pc98/boot/biosboot/README.serial b/sys/pc98/boot/biosboot/README.serial
index bf47e6c4a470..5adbfa941233 100644
--- a/sys/pc98/boot/biosboot/README.serial
+++ b/sys/pc98/boot/biosboot/README.serial
@@ -105,7 +105,7 @@ To boot FreeBSD in serial console mode, you must do the following:
 	higher priority console). This replaces the COMCONSOLE option.
 
   Example:
-  device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4
+  device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr
 
   If the flags were not set, you need to run UserConfig (on a different
   console) or recompile the kernel.
@@ -185,7 +185,7 @@ CAVEATS:
 	  `flags' for the serial port you want to use. For example, if you
 	  want to make COM2 the console:
 
-	  device sio1 at isa? port "IO_COM2" tty flags 0x10 irq 3
+	  device sio1 at isa? port "IO_COM2" tty flags 0x10 irq 3 vector siointr
 
 	  The console flags for the other serial ports should not be set.
 	o Recompile both the boot blocks and the kernel.
@@ -193,4 +193,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$Id: README.serial,v 1.5 1998/04/07 15:33:47 kato Exp $
+$Id: README.serial,v 1.4 1997/06/09 13:44:03 kato Exp $
diff --git a/sys/pc98/boot/biosboot/serial.S b/sys/pc98/boot/biosboot/serial.S
index 2cc22465fe79..ebf1c5e9c0c9 100644
--- a/sys/pc98/boot/biosboot/serial.S
+++ b/sys/pc98/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.7 1998/01/02 09:29:15 kato Exp $
+ *	$Id: serial.S,v 1.6 1997/07/14 12:34:01 kato Exp $
  */
 
 /*
@@ -65,16 +65,17 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  */ 
 
-#if COMCONSOLE == 0x238
-#include "../../../i386/boot/biosboot/serial.S"
-#else
 /*
  * modified for PC-98 by KATO T. of Nagoya University
  */
 
 	.file	"serial.S"
 
+#ifdef PC98
+#include <pc98/pc98/sioreg.h>
+#else
 #include <i386/isa/sioreg.h>
+#endif
 #include "asm.h"
 
 	.text
@@ -198,4 +199,3 @@ ENTRY(init_serial)
 	outb	%al, %dx
 
 	ret
-#endif
diff --git a/sys/pc98/boot/kzipboot/Makefile b/sys/pc98/boot/kzipboot/Makefile
index beb70a5e56cc..f97824c40ed5 100644
--- a/sys/pc98/boot/kzipboot/Makefile
+++ b/sys/pc98/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1998/05/28 13:48:40 kato Exp $
+# $Id: Makefile,v 1.5 1998/03/07 15:48:11 kato Exp $
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
@@ -22,9 +22,9 @@ CFLAGS+= -DKZIP -DCOMCONSOLE=0x30
 CFLAGS+= -DPC98
 
 kztail.o:  ${OBJS_KZTAIL}
-	$(LD) -aout -r -x -o kztail.o $(OBJS_KZTAIL)
+	$(LD) -r -x -o kztail.o $(OBJS_KZTAIL)
 
 kzhead.o:  ${OBJS_KZHEAD}
-	$(LD) -aout -r -x -o kzhead.o $(OBJS_KZHEAD)
+	$(LD) -r -x -o kzhead.o $(OBJS_KZHEAD)
 
 .include <bsd.prog.mk>
diff --git a/sys/pc98/boot/kzipboot/malloc.c b/sys/pc98/boot/kzipboot/malloc.c
index 052e5e357dbb..cf51be721a51 100644
--- a/sys/pc98/boot/kzipboot/malloc.c
+++ b/sys/pc98/boot/kzipboot/malloc.c
@@ -36,8 +36,9 @@
 extern unsigned char *storage;
 
 void *
-kzipmalloc(nbytes)
+malloc(nbytes, junk1, junk2) /* junk? not used */
 	size_t nbytes;
+	int junk1, junk2;
 {
 	unsigned char *p = storage;
 	storage += nbytes;
@@ -50,7 +51,8 @@ kzipmalloc(nbytes)
 }
 
 void
-kzipfree(cp)
+free(cp, junk) /* junk not used */
 	void *cp;
+	int junk;
 {
 }
diff --git a/sys/pc98/boot/netboot/Makefile b/sys/pc98/boot/netboot/Makefile
index dad72fc3b15d..37bfd672afab 100644
--- a/sys/pc98/boot/netboot/Makefile
+++ b/sys/pc98/boot/netboot/Makefile
@@ -36,6 +36,7 @@ PROG=	nb8390.com nb8390.rom
 # Order is very important on the SRCS line for this prog
 SRCS=	start2.S main.c misc.c bootmenu.c rpc.c
 
+BINDIR=		/usr/mdec
 BINMODE=	555
 CFLAGS=		-O2 -DNFS -DROMSIZE=${ROMSIZE} -DRELOC=${RELOCADDR} -DASK_BOOT
 CFLAGS+=	-DPC98
@@ -47,12 +48,10 @@ CFLAGS+=	-DPC98
 NS8390=	-DINCLUDE_EGY -DNE_BASE=0xd0
 CLEANFILES+=	netboot.com
 CLEANFILES+=	makerom start2.ro 3c509.o ns8390.o
-ROMLDFLAGS=	${LDFLAGS} -aout -N -T ${RELOCADDR} -e _start -nostdlib
+ROMLDFLAGS=	${LDFLAGS} -N -T ${RELOCADDR} -e _start -nostdlib
 NOSHARED=	YES
 NOMAN=
-SIZE=	size -aout
 STRIP=
-STRIPCMD=	strip -aout
 
 ROMSIZE=16384
 RELOCADDR=0x90000
@@ -73,27 +72,27 @@ makerom: makerom.c
 
 nb8390.rom:	makerom start2.ro ${SRCS:N*.h:R:S/$/.o/g} ns8390.o
 	${LD} ${ROMLDFLAGS} -o ${.TARGET} ${OBJS:S/start2.o/start2.ro/} ns8390.o
-	${STRIPCMD} ${.TARGET}
-	${SIZE} ${.TARGET}
+	strip ${.TARGET}
+	size ${.TARGET}
 	${.OBJDIR}/makerom ${.TARGET}
 
 nb3c509.rom:	makerom start2.ro ${SRCS:N*.h:R:S/$/.o/g} 3c509.o
 	${LD} ${ROMLDFLAGS} -o ${.TARGET} ${OBJS:S/start2.o/start2.ro/} 3c509.o
-	${STRIPCMD} ${.TARGET}
-	${SIZE} ${.TARGET}
+	strip ${.TARGET}
+	size ${.TARGET}
 	${.OBJDIR}/makerom ${.TARGET}
 
 nb8390.com:	makerom start2.ro ${SRCS:N*.h:R:S/$/.o/g} ns8390.o
 	${LD} ${ROMLDFLAGS} -o ${.TARGET}.tmp ${OBJS} ns8390.o
-	${STRIPCMD} ${.TARGET}.tmp
-	${SIZE} ${.TARGET}.tmp
+	strip ${.TARGET}.tmp
+	size ${.TARGET}.tmp
 	dd ibs=32 skip=1 if=${.TARGET}.tmp of=${.TARGET}
 	rm -f ${.TARGET}.tmp
 
 nb3c509.com:	start2.o ${SRCS:N*.h:R:S/$/.o/g} 3c509.o
 	${LD} ${ROMLDFLAGS} -o ${.TARGET}.tmp ${OBJS} 3c509.o
-	${STRIPCMD} ${.TARGET}.tmp
-	${SIZE} ${.TARGET}.tmp
+	strip ${.TARGET}.tmp
+	size ${.TARGET}.tmp
 	dd ibs=32 skip=1 if=${.TARGET}.tmp of=${.TARGET}
 	rm -f ${.TARGET}.tmp
 
diff --git a/sys/pc98/boot/rawboot/Makefile b/sys/pc98/boot/rawboot/Makefile
index 7aafe0de65fd..b549f42f07d8 100644
--- a/sys/pc98/boot/rawboot/Makefile
+++ b/sys/pc98/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/03/30 12:24:12 kato Exp $
+#	$Id: Makefile,v 1.10 1998/03/14 02:30:01 kato Exp $
 #
 
 PROG=	boot
@@ -9,6 +9,7 @@ SRCS+=  probe_keyboard.c io.c disk.c sys.c
 
 .PATH:	${.CURDIR}/../biosboot
 
+BINDIR=		/usr/mdec
 BINMODE=	444
 CFLAGS=		-O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
 		-DPC98 \
@@ -68,8 +69,8 @@ BOOTSTACK=	0xFFF0
 
 boot.strip:	boot
 	cp -p boot boot.strip
-	strip -aout boot.strip
-	size -aout boot.strip
+	strip boot.strip
+	size boot.strip
 
 boot.nohdr:	boot.strip
 	dd if=boot.strip of=boot.nohdr ibs=32 skip=1 obs=1024b