release/3.0.0

12 files changed, 57 insertions, 43 deletions

diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index dc8ad32a5f6a3..a075627ba2496 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -1,5 +1,5 @@
-#	$Id: Makefile,v 1.29 1997/07/10 21:58:43 joerg Exp $
+#	$Id: Makefile,v 1.28 1997/02/22 09:29:58 peter Exp $
 
-SUBDIR=	cdboot dosboot kzipboot netboot rawboot
+SUBDIR=	biosboot cdboot dosboot kzipboot netboot rawboot
 
 .include <bsd.subdir.mk>
diff --git a/sys/i386/boot/Makefile.inc b/sys/i386/boot/Makefile.inc
index 520458a2126b6..2b92805e79772 100644
--- a/sys/i386/boot/Makefile.inc
+++ b/sys/i386/boot/Makefile.inc
@@ -1,7 +1,5 @@
-#	$Id: Makefile.inc,v 1.3 1998/12/30 10:05:56 bde Exp $
+#	$Id$
 
-BINDIR?=	/usr/mdec
-CFLAGS+=	-aout
 .if exists(${.CURDIR}/../../../../include)
 CFLAGS+=	-nostdinc -I${.CURDIR}/../../../../include
 .endif
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index e4feaf98de984..cf517706cdb92 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.67 1998/11/21 21:07:17 ache Exp $
+#	$Id: Makefile,v 1.65 1998/09/15 09:59:57 gibbs 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 \
@@ -59,8 +60,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
@@ -81,11 +82,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/i386/boot/biosboot/README.serial b/sys/i386/boot/biosboot/README.serial
index 732e4787e35ce..f00d7d0f2d111 100644
--- a/sys/i386/boot/biosboot/README.serial
+++ b/sys/i386/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.9 1997/06/16 06:32:51 charnier Exp $
+$Id: README.serial,v 1.8 1997/06/09 05:10:54 bde Exp $
diff --git a/sys/i386/boot/biosboot/probe_keyboard.c b/sys/i386/boot/biosboot/probe_keyboard.c
index 7856d586a58ff..951d92bcc57fb 100644
--- a/sys/i386/boot/biosboot/probe_keyboard.c
+++ b/sys/i386/boot/biosboot/probe_keyboard.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp $
+ * $Id:$
  */
 
 #include <sys/types.h>
@@ -31,8 +31,7 @@
 #include <machine/cpufunc.h>
 
 #include <i386/isa/isa.h>
-
-#include <dev/kbd/atkbdcreg.h>
+#include <i386/isa/kbdio.h>
 
 #include "boot.h"
 
diff --git a/sys/i386/boot/cdboot/Makefile b/sys/i386/boot/cdboot/Makefile
index b59e851fd870a..4c01c44b33730 100644
--- a/sys/i386/boot/cdboot/Makefile
+++ b/sys/i386/boot/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/03/12 12:26:47 bde Exp $
+#	$Id: Makefile,v 1.3 1997/07/21 16:12:52 bde Exp $
 #
 
 PROG=	boot
@@ -8,6 +8,7 @@ SRCS+=  probe_keyboard.c io.c cdrom.c malloc.c
 
 .PATH:	${.CURDIR}/../biosboot
 
+BINDIR=		/usr/mdec
 BINMODE=	444
 CFLAGS=		-O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
 		-mno-486 \
@@ -46,6 +47,10 @@ CFLAGS+=	-DCONSPEED=${BOOT_COMCONSOLE_SPEED}
 
 CLEANFILES+=	boot.img boot.nohdr boot.strip
 LDFLAGS+=	-N -T 0 -nostdlib
+#LINKS=		${BINDIR}/sdboot ${BINDIR}/wdboot\
+#		${BINDIR}/sdboot ${BINDIR}/fdboot\
+#		${BINDIR}/bootsd ${BINDIR}/bootwd\
+#		${BINDIR}/bootsd ${BINDIR}/bootfd
 NOSHARED=	YES
 NOMAN=
 STRIP=
@@ -63,8 +68,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
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index 26c0d0bf04aac..d73363f3eb52a 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,8 +1,9 @@
-#	$Id: Makefile,v 1.4 1997/02/22 09:30:28 peter Exp $
+#	$Id$
 #
 
 MPROG=	fbsdboot.exe
 CLEANFILES+=	${MPROG}
+BINDIR=		/usr/mdec
 BINMODE=	444
 NOMAN=
 STRIP=
diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h
index 81a7c06af6d69..d550d47bcc1f2 100644
--- a/sys/i386/boot/dosboot/disklabe.h
+++ b/sys/i386/boot/dosboot/disklabe.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93

- * $Id: disklabe.h,v 1.4 1997/02/22 09:30:46 peter Exp $

+ * $Id$

  */

 

 #ifndef _SYS_DISKLABEL_H_

@@ -100,7 +100,7 @@ struct disklabel {
 	 * the disklabel is read off the disk or in-core copy.

 	 * d_boot0 and d_boot1 are the (optional) names of the

 	 * primary (block 0) and secondary (block 1-15) bootstraps

-	 * as found in /boot.  These are returned when using

+	 * as found in /usr/mdec.  These are returned when using

 	 * getdiskbyname(3) to retrieve the values from /etc/disktab.

 	 */

 #if defined(KERNEL) || defined(STANDALONE)

diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile
index c1dc06009dad9..74eb39347480a 100644
--- a/sys/i386/boot/kzipboot/Makefile
+++ b/sys/i386/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1998/05/27 08:06:33 sos Exp $
+# $Id: Makefile,v 1.8 1998/03/07 10:48:10 eivind Exp $
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
@@ -21,9 +21,9 @@ CFLAGS+= -DKADDR=$(KADDR) -DCSEG=$(CSEG)
 CFLAGS+= -DKZIP -DCOMCONSOLE=0x3F8
 
 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/i386/boot/kzipboot/malloc.c b/sys/i386/boot/kzipboot/malloc.c
index 052e5e357dbbd..cf51be721a517 100644
--- a/sys/i386/boot/kzipboot/malloc.c
+++ b/sys/i386/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/i386/boot/netboot/Makefile b/sys/i386/boot/netboot/Makefile
index 2d50c65a58e76..ec81713c1d049 100644
--- a/sys/i386/boot/netboot/Makefile
+++ b/sys/i386/boot/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.21 1998/11/28 08:03:24 joerg Exp $
+#	$Id: Makefile,v 1.18 1998/06/30 11:10:24 phk Exp $
 #
 # Makefile for NETBOOT
 #
@@ -30,6 +30,7 @@ PROG=	nb8390.com nb3c509.com nb8390.rom nb3c509.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=		-O2 -DNFS -DROMSIZE=${ROMSIZE} -DRELOC=${RELOCADDR} # -DASK_BOOT
@@ -40,12 +41,10 @@ NS8390=	-DINCLUDE_NE
 #NS8390+=	-DINCLUDE_3COM -D_3COM_BASE=0x300
 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
 MAN8=	netboot.8
-SIZE=	size -aout
 STRIP=
-STRIPCMD=	strip -aout
 
 ROMSIZE=16384
 RELOCADDR=0x90000
@@ -66,27 +65,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/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile
index 061b6959ecf76..5b2729f0a61a8 100644
--- a/sys/i386/boot/rawboot/Makefile
+++ b/sys/i386/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/03/12 12:26:49 bde Exp $
+#	$Id: Makefile,v 1.10 1998/03/07 10:48:15 eivind 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 \
 		-DRAWBOOT \
@@ -62,8 +63,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