Use files under sys/boot/i386 instead of copying under sys/boot/pc98.

Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>

5 files changed, 5 insertions, 108 deletions

diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 76d9cd0..337f753 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1999/03/10 13:41:44 kato Exp $
+# $Id: Makefile,v 1.4 1999/03/18 13:42:21 kato Exp $
 
 BASE=		loader
 PROG=		${BASE}
@@ -69,7 +69,7 @@ CFLAGS+=	-DNEW_LINKER_SET
 #LDFLAGS+=	-g
 
 vers.o:
-	sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+	sh ${.CURDIR}/../../i386/loader/newvers.sh ${.CURDIR}/../../i386/loader/version ${NEWVERSWHAT}
 	${CC} -c vers.c
 
 ${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} ${BASE}.help
@@ -82,7 +82,7 @@ ${BASE}.bin: ${BASE}.sym
 	cp ${.ALLSRC} ${.TARGET}
 	strip ${.TARGET}
 
-${BASE}.help: help.common help.pc98
+${BASE}.help: help.common help.i386
 	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
 beforeinstall:
diff --git a/sys/boot/pc98/loader/help.pc98 b/sys/boot/pc98/loader/help.pc98
deleted file mode 100644
index 4e4ec8b..0000000
--- a/sys/boot/pc98/loader/help.pc98
+++ /dev/null
@@ -1,46 +0,0 @@
-################################################################################
-# Treboot DReboot the system
-
-	reboot
-
-	Causes the system to immediately reboot.
-
-################################################################################
-# Theap DDisplay memory management statistics
-
-	heap
-
-	Requests debugging output from the heap manager.  For debugging use
-	only.
-
-################################################################################
-# Tset Snum_ide_disks DSet the number of IDE disks
-
-	NOTE: this variable is deprecated, use root_disk_unit instead.
-
-	set num_ide_disks=<value>
-
-	When booting from a SCSI disk on a system with one or more IDE disks,
-	and where the IDE disks are the default boot device, it is necessary
-	to tell the kernel how many IDE disks there are in order to have it
-	correctly locate the SCSI disk you are booting from.
-
-################################################################################
-# Tset Sboot_userconfig DStart Userconfig
-
-	set boot_userconfig
-
-	Requests that the kernel's interactive device configuration program
-	be run when the kernel is booted.
-
-################################################################################
-# Tset Sroot_disk_unit DForce the root disk unit number.
-
-	set root_disk_unit=<value>
-
-	If the code which detects the disk unit number for the root disk is
-	confused, eg. by a mix of SCSI and IDE disks, or IDE disks with
-	gaps in the sequence (eg. no primary slave), the unit number can be
-	forced by setting this variable.
-
-################################################################################
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 8655dbf..4b7aa2f 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.1 1999/02/03 08:39:09 kato Exp $
+ *	$Id: main.c,v 1.2 1999/03/04 10:48:14 kato Exp $
  */
 
 /*
@@ -37,7 +37,7 @@
 #include <sys/reboot.h>
 
 #include "bootstrap.h"
-#include "../../i386/libi386/libi386.h"
+#include "libi386/libi386.h"
 #include "btxv86.h"
 
 /* Arguments passed in from the boot1/boot2 loader */
diff --git a/sys/boot/pc98/loader/newvers.sh b/sys/boot/pc98/loader/newvers.sh
deleted file mode 100644
index 476913b..0000000
--- a/sys/boot/pc98/loader/newvers.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -
-#
-#	$NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $
-#
-# Copyright (c) 1984, 1986, 1990, 1993
-#	The Regents of the University of California.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-
-LC_TIME=C; export LC_TIME
-u=${USER-root} h=`hostname` t=`date`
-#r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
-r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
-
-echo "char bootprog_name[] = \"FreeBSD/i386 ${2}\";" > vers.c
-echo "char bootprog_rev[] = \"${r}\";" >> vers.c
-echo "char bootprog_date[] = \"${t}\";" >> vers.c
-echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
diff --git a/sys/boot/pc98/loader/version b/sys/boot/pc98/loader/version
deleted file mode 100644
index 00bb29e..0000000
--- a/sys/boot/pc98/loader/version
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: version,v 1.2 1999/02/08 09:59:38 kato Exp $
-
-NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
-file is important.  Make sure the current version number is on line 6.
-
-0.7:	Supports large KVM
-0.6:	Increased dictionary size -- supports loader.4th
-0.5:	First release version
-0.2:	Initial integration with BTX
-0.1:	Initial i386 version, inspiration and some structure from the
-	NetBSD version.