diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2004-02-23 01:19:53 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2004-02-23 01:19:53 +0000 |
| commit | c405e11efb4948635a9f2969977ce6b2855e6628 (patch) | |
| tree | 4a535710a3a378e693caccdec6252656be010f08 /sys/arch/amd64/stand | |
| parent | f9429574c85acd0974ac93c2f82dd1ee0d430364 (diff) | |
- Pick up the /boot argc, argv in locore.S (though not currently used)
- Probe for console devices (incl serial) in /boot
- Pass console device from /boot to kernel (temp via additional param)
With this, boot> set tty com0 now works.
"just don't break a build" deraadt@
Diffstat (limited to 'sys/arch/amd64/stand')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/exec_i386.c | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/machdep.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/libsa/exec_i386.c b/sys/arch/amd64/stand/libsa/exec_i386.c index 0b814d9d3db..d1f78ac3cae 100644 --- a/sys/arch/amd64/stand/libsa/exec_i386.c +++ b/sys/arch/amd64/stand/libsa/exec_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_i386.c,v 1.1 2004/02/03 12:09:47 mickey Exp $ */ +/* $OpenBSD: exec_i386.c,v 1.2 2004/02/23 01:19:52 tom Exp $ */ /* * Copyright (c) 1997-1998 Michael Shalayeff @@ -37,7 +37,7 @@ #include "libsa.h" #include <lib/libsa/loadfile.h> -typedef void (*startfuncp)(int, int, int, int, int, int, int, int) +typedef void (*startfuncp)(int, int, int, int, int, int, int, int, int) __attribute__ ((noreturn)); void @@ -68,6 +68,6 @@ run_loadfile(u_long *marks, int howto) ((int *)entry)[0], ((int *)entry)[1], ((int *)entry)[2], ((int *)entry)[3]); /* stack and the gung is ok at this point, so, no need for asm setup */ (*(startfuncp)entry)(howto, bootdev, BOOTARG_APIVER, - marks[MARK_END], extmem, cnvmem, ac, (int)av); + marks[MARK_END], extmem, cnvmem, ac, (int)av, cd.consdev); /* not reached */ } diff --git a/sys/arch/amd64/stand/libsa/machdep.c b/sys/arch/amd64/stand/libsa/machdep.c index 440a14c09bd..ffc1f8e52d8 100644 --- a/sys/arch/amd64/stand/libsa/machdep.c +++ b/sys/arch/amd64/stand/libsa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.1 2004/02/03 12:09:47 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.2 2004/02/23 01:19:52 tom Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -48,9 +48,11 @@ machdep(void) printf("probing:"); /* probe for a model number, gateA20() neds ps2model */ gateA20(1); CKPT('1'); - memprobe(); CKPT('2'); + /* initialise a console (and probe for com* devices) */ + cninit(); CKPT('2'); + memprobe(); CKPT('3'); printf("\n"); - diskprobe(); CKPT('3'); + diskprobe(); CKPT('4'); CKPT('Z'); } |