diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2015-03-29 15:41:16 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2015-03-29 15:41:16 +0000 |
| commit | 0a0369a02469a60afecdc199d3962fbfbcdbcb2b (patch) | |
| tree | b241ad4504fbca94ae16644c0a742a9708b69f7f /sys | |
| parent | bb65e559644bff7131847671edb10f57cd0526b4 (diff) | |
Correctly match SUNW,fas in the boot path.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/dev/esp.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index faa1c504665..5814a9af87d 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.35 2015/03/28 19:08:23 miod Exp $ */ +/* $OpenBSD: esp.c,v 1.36 2015/03/29 15:41:15 miod Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -484,17 +484,19 @@ espattach(parent, self, aux) * below. */ bp = ca->ca_ra.ra_bp; - switch (ca->ca_bustype) { - case BUS_SBUS: - if (bp != NULL && strcmp(bp->name, "esp") == 0 && - SAME_ESP(sc, bp, ca)) - bootpath_store(1, bp + 1); - break; - default: - if (bp != NULL && strcmp(bp->name, "esp") == 0 && - bp->val[0] == -1 && bp->val[1] == sc->sc_dev.dv_unit) - bootpath_store(1, bp + 1); - break; + if (bp != NULL && (strcmp(bp->name, "esp") == 0 || + strcmp(bp->name, ca->ca_ra.ra_name) == 0)) { + switch (ca->ca_bustype) { + case BUS_SBUS: + if (SAME_ESP(sc, bp, ca)) + bootpath_store(1, bp + 1); + break; + default: + if (bp->val[0] == -1 && + bp->val[1] == sc->sc_dev.dv_unit) + bootpath_store(1, bp + 1); + break; + } } /* Turn on target selection using the `dma' method */ |