diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-03-14 17:04:49 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-03-14 17:04:49 +0000 |
| commit | 2ef7c3ccfc088069a793ba52967ca1c6e6da0e84 (patch) | |
| tree | f83208947971c397a06733eda7bbcae8197c56b5 /sys/arch/sparc64 | |
| parent | b18c4f6a6b3d670bfce3bb1192cfdfbd4d155b25 (diff) | |
Don't even try to attach pcons(4) if we have a real console.
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/sparc64/autoconf.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index cd6362dc8fe..06f8542148c 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.80 2008/03/13 23:03:02 kettenis Exp $ */ +/* $OpenBSD: autoconf.c,v 1.81 2008/03/14 17:04:48 kettenis Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -839,10 +839,15 @@ extern bus_space_tag_t mainbus_space_tag; if (ma.ma_naddress) free(ma.ma_address, M_DEVBUF); } - /* Try to attach PROM console */ - bzero(&ma, sizeof ma); - ma.ma_name = "pcons"; - config_found(dev, &ma, mbprint); + + extern int prom_cngetc(dev_t); + + /* Attach PROM console if no other console attached. */ + if (cn_tab->cn_getc == prom_cngetc) { + bzero(&ma, sizeof ma); + ma.ma_name = "pcons"; + config_found(dev, &ma, mbprint); + } extern todr_chip_handle_t todr_handle; |