diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-07-27 20:41:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-07-27 20:41:30 +0000 |
| commit | c73f780b2c91fa61cafdc5ad8c663aeb28ef8434 (patch) | |
| tree | ff9bcdfe3294b6c5f4fa7351966bb6d5b94c3878 /sys/arch | |
| parent | 2b4d003b674ac7e18755b261c3ce970d1002e525 (diff) | |
remove weird floppyboot garbage; ok miod
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/stand/ofwboot/boot.c | 9 | ||||
| -rw-r--r-- | sys/arch/sparc64/stand/ofwboot/ofdev.c | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c index bbda2f8e456..7e854d019c2 100644 --- a/sys/arch/sparc64/stand/ofwboot/boot.c +++ b/sys/arch/sparc64/stand/ofwboot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.11 2004/01/03 21:17:43 pvalchev Exp $ */ +/* $OpenBSD: boot.c,v 1.12 2006/07/27 20:41:28 deraadt Exp $ */ /* $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $ */ /* * Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved. @@ -261,13 +261,6 @@ loadfile(fd, args) close(fd); - /* XXX this should be replaced w/ a mountroothook. */ - if (floppyboot) { - printf("Please insert root disk and press ENTER "); - getchar(); - printf("\n"); - } - chain(entry, args, ssym, esym); /* NOTREACHED */ diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c index 9f1e1afc10e..870e7c347b4 100644 --- a/sys/arch/sparc64/stand/ofwboot/ofdev.c +++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofdev.c,v 1.7 2006/03/04 19:33:21 miod Exp $ */ +/* $OpenBSD: ofdev.c,v 1.8 2006/07/27 20:41:29 deraadt Exp $ */ /* $NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $ */ /* @@ -209,7 +209,6 @@ static struct of_dev ofdev = { }; char opened_name[256]; -int floppyboot; static u_long get_long(p) @@ -434,7 +433,6 @@ devopen(of, name, file) #ifdef NOTDEF_DEBUG printf("devopen: %s is called %s\n", fname, buf); #endif - floppyboot = !strcmp(buf, "floppy"); if (OF_getprop(handle, "device_type", buf, sizeof buf) < 0) return ENXIO; #ifdef NOTDEF_DEBUG |