Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integrate BUILTIN_KERNEL_LOADER and KERNE_PATH into KLOADER_KERNEL_PATH.

This commit is contained in:
uch 2001-11-23 16:08:45 +00:00
parent 6bd02d8e33
commit 9d6cd691b6
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/playstation2/conf/AGATE
View File

@ -1,7 +1,7 @@
#
# -- SCPH-18000 used by uch@netbsd.org
#
# $NetBSD: AGATE,v 1.2 2001/11/20 12:56:36 lukem Exp $
# $NetBSD: AGATE,v 1.3 2001/11/23 16:08:46 uch Exp $
#
include "arch/playstation2/conf/std.playstation2"
@ -12,7 +12,7 @@ config nfsnetbsd root on smap0 type nfs
makeoptions DEFGP="-G 40"
options BUILTIN_KERNEL_LOADER
options KLOADER_KERNEL_PATH="\"/netbsd\""
options DDB # in-kernel debugger

4
sys/arch/playstation2/conf/DEBUG
View File

@ -1,7 +1,7 @@
#
# kernel config file for debugging.
#
# $NetBSD: DEBUG,v 1.2 2001/11/20 12:56:36 lukem Exp $
# $NetBSD: DEBUG,v 1.3 2001/11/23 16:08:46 uch Exp $
#
include "arch/playstation2/conf/std.playstation2"
@ -11,7 +11,7 @@ config netbsd root on ? type ?
makeoptions DEFGP="-G 0"
options BUILTIN_KERNEL_LOADER, KERNEL_PATH="\"/netbsd\""
options KLOADER_KERNEL_PATH="\"/netbsd\""
options NMBCLUSTERS=4096 # Max. number of mbuf clusters
options PPP_BSDCOMP # BSD-Compress compression support for PPP

4
sys/arch/playstation2/conf/RAMDISK
View File

@ -1,7 +1,7 @@
#
# kernel config file for memory(RAM) disk
#
# $NetBSD: RAMDISK,v 1.2 2001/11/20 12:56:36 lukem Exp $
# $NetBSD: RAMDISK,v 1.3 2001/11/23 16:08:45 uch Exp $
#
include "arch/playstation2/conf/std.playstation2"
@ -21,4 +21,4 @@ options MEMORY_DISK_SERVER=0 # no userspace memory disk support
options MINIROOTSIZE=10240 # size of memory disk, in blocks
# Reboot from HDD
options BUILTIN_KERNEL_LOADER, KERNEL_PATH="\"/mnt/netbsd\""
options KLOADER_KERNEL_PATH="\"/mnt/netbsd\""

6
sys/arch/playstation2/conf/files.playstation2
View File

@ -1,4 +1,4 @@
# $NetBSD: files.playstation2,v 1.3 2001/11/20 14:34:24 lukem Exp $
# $NetBSD: files.playstation2,v 1.4 2001/11/23 16:08:45 uch Exp $
maxpartitions 8
@ -27,8 +27,8 @@ file arch/playstation2/playstation2/disksubr.c disk
file arch/playstation2/playstation2/machdep.c
file arch/playstation2/playstation2/procfs_machdep.c procfs
file arch/playstation2/playstation2/sifbios.c
defparam opt_builtin_kernel_loader.h KERNEL_PATH BUILTIN_KERNEL_LOADER
file arch/playstation2/playstation2/kloader.c builtin_kernel_loader
defparam opt_kloader_kernel_path.h KLOADER_KERNEL_PATH
file arch/playstation2/playstation2/kloader.c kloader_kernel_path
file dev/clock_subr.c
#

15
sys/arch/playstation2/playstation2/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.1 2001/10/16 15:38:55 uch Exp $ */
/* $NetBSD: machdep.c,v 1.2 2001/11/23 16:08:45 uch Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include "opt_ddb.h"
#include "opt_builtin_kernel_loader.h"
#include "opt_kloader_kernel_path.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -64,11 +64,8 @@
#include <machine/intr.h>/* hardintr_init */
#include <playstation2/playstation2/sifbios.h>
#include <playstation2/playstation2/interrupt.h>
#ifdef BUILTIN_KERNEL_LOADER
#ifdef KLOADER_KERNEL_PATH
#include <playstation2/playstation2/kloader.h>
#ifndef KERNEL_PATH
#define KERNEL_PATH "/netbsd"
#endif
#endif
/* For sysctl. */
@ -313,8 +310,8 @@ cpu_reboot(int howto, char *bootstr)
if (boothowto & RB_HALT) {
howto |= RB_HALT;
} else {
#ifdef BUILTIN_KERNEL_LOADER
kloader_reboot_setup(KERNEL_PATH);
#ifdef KLOADER_KERNEL_PATH
kloader_reboot_setup(KLOADER_KERNEL_PATH);
#endif
}
@ -343,7 +340,7 @@ cpu_reboot(int howto, char *bootstr)
else if (howto & RB_HALT)
sifbios_halt(1); /* halt */
else {
#ifdef BUILTIN_KERNEL_LOADER
#ifdef KLOADER_KERNEL_PATH
kloader_reboot();
/* NOTREACHED */
#endif