diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-09-15 09:02:00 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-09-15 09:02:00 +0000 |
commit | 8f6680cb282c2e34abd90fe05faa4162db0d95bc (patch) | |
tree | 2ee5f1f62f18a077f21d599f3b18a39f701c9275 /sys/arch/macppc/stand/boot.c | |
parent | 0684ecd769796e91ce28e5f3907744c787dcbe07 (diff) |
backout premature
Diffstat (limited to 'sys/arch/macppc/stand/boot.c')
-rw-r--r-- | sys/arch/macppc/stand/boot.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/macppc/stand/boot.c b/sys/arch/macppc/stand/boot.c index 192771e9db7..14b94c818b3 100644 --- a/sys/arch/macppc/stand/boot.c +++ b/sys/arch/macppc/stand/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.7 2002/09/15 02:02:44 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.8 2002/09/15 09:01:59 deraadt Exp $ */ /* $NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $ */ /* @@ -55,6 +55,7 @@ #include <lib/libsa/stand.h> #include <lib/libsa/loadfile.h> + #include <machine/cpu.h> #include <macppc/stand/ofdev.h> @@ -70,7 +71,7 @@ prom2boot(dev) char *dev; { char *cp, *lp = 0; - + for (cp = dev; *cp; cp++) if (*cp == ':') lp = cp; @@ -108,7 +109,7 @@ parseargs(str, howtop) } if (!*cp) return; - + *cp++ = 0; while (*cp) { switch (*cp++) { @@ -174,15 +175,15 @@ main() u_int32_t entry; void *ssym, *esym; int fd; - + printf("\n>> OpenBSD/macppc Boot\n"); /* * Get the boot arguments from Openfirmware */ - if ((chosen = OF_finddevice("/chosen")) == -1 || - OF_getprop(chosen, "bootpath", bootdev, sizeof bootdev) < 0 || - OF_getprop(chosen, "bootargs", bootline, sizeof bootline) < 0) { + if ((chosen = OF_finddevice("/chosen")) == -1 + || OF_getprop(chosen, "bootpath", bootdev, sizeof bootdev) < 0 + || OF_getprop(chosen, "bootargs", bootline, sizeof bootline) < 0) { printf("Invalid Openfirmware environment\n"); exit(); } |