diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2009-04-30 01:16:57 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2009-04-30 01:16:57 +0000 |
| commit | 240a6158ac08ed66b16846e1b0129a23dd34bb8b (patch) | |
| tree | f56c5a84f2ed9b998eb697876a7307ba8d12ed2a /sys/arch/amd64/stand | |
| parent | c4e186805a0e3fdc696e564818fa7de1ad3ef1fb (diff) | |
pass db_console from the bootloader to the kernel, and then use it to
set ddb.console real early.
requested by art@
no problem! deraadt@
Diffstat (limited to 'sys/arch/amd64/stand')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/exec_i386.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/amd64/stand/libsa/exec_i386.c b/sys/arch/amd64/stand/libsa/exec_i386.c index d05fb66b3db..c72a0d0a737 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.5 2007/07/27 17:48:01 tom Exp $ */ +/* $OpenBSD: exec_i386.c,v 1.6 2009/04/30 01:16:56 dlg Exp $ */ /* * Copyright (c) 1997-1998 Michael Shalayeff @@ -54,6 +54,8 @@ run_loadfile(u_long *marks, int howto) caddr_t av = (caddr_t)BOOTARG_OFF; bios_consdev_t cd; extern int com_speed; /* from bioscons.c */ + bios_ddb_t ddb; + extern int db_console; if (sa_cleanup != NULL) (*sa_cleanup)(); @@ -65,6 +67,11 @@ run_loadfile(u_long *marks, int howto) if (bootmac != NULL) addbootarg(BOOTARG_BOOTMAC, sizeof(bios_bootmac_t), bootmac); + if (db_console != -1) { + ddb.db_console = db_console; + addbootarg(BOOTARG_DDB, sizeof(ddb), &ddb); + } + /* Pass memory map to the kernel */ mem_pass(); |