summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDale S. Rahn <rahnds@cvs.openbsd.org>1998-08-07 02:10:27 +0000
committerDale S. Rahn <rahnds@cvs.openbsd.org>1998-08-07 02:10:27 +0000
commitfa8817757f0a24834abc674e540d3949f595a75d (patch)
tree858f0582df9985bb80f2b79f84cbf74e4adeb1c2 /sys/arch
parentec5596645eaa1fb1ae8dd6d4247d797729d29eb9 (diff)
Remove floppy checks from ofwboot. Ramdisk is kernel, not loadef from floppy.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/powerpc/stand/boot.c7
-rw-r--r--sys/arch/powerpc/stand/ofdev.c2
-rw-r--r--sys/arch/powerpc/stand/ofdev.h1
3 files changed, 0 insertions, 10 deletions
diff --git a/sys/arch/powerpc/stand/boot.c b/sys/arch/powerpc/stand/boot.c
index cae95a59de6..b7c86b273cf 100644
--- a/sys/arch/powerpc/stand/boot.c
+++ b/sys/arch/powerpc/stand/boot.c
@@ -205,13 +205,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((void *)entry, args, esym);
/* NOTREACHED */
diff --git a/sys/arch/powerpc/stand/ofdev.c b/sys/arch/powerpc/stand/ofdev.c
index 68416df9910..7e30e842dd2 100644
--- a/sys/arch/powerpc/stand/ofdev.c
+++ b/sys/arch/powerpc/stand/ofdev.c
@@ -163,7 +163,6 @@ static struct of_dev ofdev = {
};
char opened_name[256];
-int floppyboot;
static u_long
get_long(p)
@@ -281,7 +280,6 @@ devopen(of, name, file)
return ENOENT;
if (OF_getprop(handle, "name", buf, sizeof buf) < 0)
return ENXIO;
- floppyboot = !strcmp(buf, "floppy");
if (OF_getprop(handle, "device_type", buf, sizeof buf) < 0)
return ENXIO;
if (!strcmp(buf, "block"))
diff --git a/sys/arch/powerpc/stand/ofdev.h b/sys/arch/powerpc/stand/ofdev.h
index 2910ac51460..104aea6012c 100644
--- a/sys/arch/powerpc/stand/ofdev.h
+++ b/sys/arch/powerpc/stand/ofdev.h
@@ -51,6 +51,5 @@ struct of_dev {
#endif
extern char opened_name[];
-extern int floppyboot;
#endif