diff options
Diffstat (limited to 'sys/arch/mvmeppc/stand')
| -rw-r--r-- | sys/arch/mvmeppc/stand/bootsd/boot.c | 10 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/stand/libsa/exec_mvme.c | 13 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/stand/libsa/parse_args.c | 25 |
3 files changed, 6 insertions, 42 deletions
diff --git a/sys/arch/mvmeppc/stand/bootsd/boot.c b/sys/arch/mvmeppc/stand/bootsd/boot.c index a8244fdefc6..7f3a0e893c2 100644 --- a/sys/arch/mvmeppc/stand/bootsd/boot.c +++ b/sys/arch/mvmeppc/stand/bootsd/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.3 2003/06/02 23:27:53 millert Exp $ */ +/* $OpenBSD: boot.c,v 1.4 2004/01/24 21:12:21 miod Exp $ */ /* $NetBSD: boot.c,v 1.2 1995/09/23 03:42:52 gwr Exp $ */ /*- @@ -40,11 +40,6 @@ #include "stand.h" #include "libsa.h" -#define RB_NOSYM 0x400 -#define RB_MULTI 0x4000 -#define RB_EXTRA 0x8000 -#define RB_ASKKERN 0x0010 /* ask kernel name */ - int debug; int errno; extern char *version; @@ -62,9 +57,6 @@ main() printf("\n>> OpenBSD/mvmeppc bootsd [%s]\n", version); ret = parse_args(&file, &flag); - if (flag & RB_ASKKERN) { - ask = 1; - } for (;;) { if (ask) { printf("boot: "); diff --git a/sys/arch/mvmeppc/stand/libsa/exec_mvme.c b/sys/arch/mvmeppc/stand/libsa/exec_mvme.c index c8e6735baa1..41a525a893f 100644 --- a/sys/arch/mvmeppc/stand/libsa/exec_mvme.c +++ b/sys/arch/mvmeppc/stand/libsa/exec_mvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_mvme.c,v 1.4 2004/01/01 01:11:12 miod Exp $ */ +/* $OpenBSD: exec_mvme.c,v 1.5 2004/01/24 21:12:22 miod Exp $ */ /*- @@ -41,11 +41,6 @@ #include "stand.h" #include "libsa.h" -#define RB_NOSYM 0x400 -#define RB_MULTI 0x4000 -#define RB_EXTRA 0x8000 -#define RB_ASKKERN 0x0010 /* ask kernel name */ - vaddr_t ssym, esym; int @@ -200,9 +195,9 @@ int flag; int rval = 1; char dummy[]="\0"; - if (flag & RB_EXTRA) { - printf("exec_mvme: file=%s flag=0x%x cputyp=%x\n", file, flag, bugargs.cputyp); - } +#ifdef DEBUG + printf("exec_mvme: file=%s flag=0x%x cputyp=%x\n", file, flag, bugargs.cputyp); +#endif io = open(file, 0); if (io < 0) diff --git a/sys/arch/mvmeppc/stand/libsa/parse_args.c b/sys/arch/mvmeppc/stand/libsa/parse_args.c index 945374424b2..7b7089cade7 100644 --- a/sys/arch/mvmeppc/stand/libsa/parse_args.c +++ b/sys/arch/mvmeppc/stand/libsa/parse_args.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse_args.c,v 1.2 2003/06/02 18:47:58 deraadt Exp $ */ +/* $OpenBSD: parse_args.c,v 1.3 2004/01/24 21:12:22 miod Exp $ */ /*- * Copyright (c) 1995 Theo de Raadt @@ -35,26 +35,6 @@ #include "libsa.h" #define KERNEL_NAME "bsd" -#define RB_NOSYM 0x400 - -#define RB_AUTOBOOT 0 /* flags for system auto-booting itself */ - -#if 0 -#define RB_ASKNAME 0x0001 /* ask for file name to reboot from */ -#define RB_SINGLE 0x0002 /* reboot to single user only */ -#define RB_NOSYNC 0x0004 /* dont sync before reboot */ -#define RB_HALT 0x0008 /* don't reboot, just halt */ -#define RB_INITNAME 0x0010 /* name given for /etc/init (unused) */ -#define RB_DFLTROOT 0x0020 /* use compiled-in rootdev */ -#define RB_KDB 0x0040 /* give control to kernel debugger */ -#define RB_RDONLY 0x0080 /* mount root fs read-only */ -#define RB_DUMP 0x0100 /* dump kernel memory before reboot */ -#define RB_MINIROOT 0x0200 /* mini-root present in memory at boot time */ -#define RB_CONFIG 0x0400 /* change configured devices */ -#define RB_TIMEBAD 0x0800 /* don't call resettodr() in boot() */ -#define RB_POWERDOWN 0x1000 /* attempt to power down machine */ -#define RB_SERCONS 0x2000 /* use serial console if available */ -#endif struct flags { char c; @@ -64,12 +44,9 @@ struct flags { { 'b', RB_HALT }, { 'c', RB_CONFIG }, { 'd', RB_KDB }, - { 'e', 0x4000 }, /* spin slave cpus */ - { 'f', 0x0010 }, /* ask kernel name */ { 'm', RB_MINIROOT }, { 'r', RB_DFLTROOT }, { 's', RB_SINGLE }, - { 'x', 0x8000 }, /* extra boot debug */ { 'y', RB_NOSYM }, }; |