aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/de
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>1999-05-03 09:36:29 +0000
committerDoug Rabson <dfr@FreeBSD.org>1999-05-03 09:36:29 +0000
commit84b399de519961b8ef8fb45fa4c029c20755158c (patch)
tree1e3c6a264b392753dd194c9482ceddd49c21602d /sys/dev/de
parent67fb73e4b4e5848baf312fc6f34ffd439b632467 (diff)
downloadsrc-84b399de519961b8ef8fb45fa4c029c20755158c.tar.gz
src-84b399de519961b8ef8fb45fa4c029c20755158c.zip
Changes to support diskless booting on the alpha:
* Make the network code in the bootstrap more chatty (helps debugging) * Add nfs root stuff to cpu_rootconf(). I also added a check to make sure it really was netbooting which allows the use of the same kernel for local and network boots. * Tweak the de driver so that it takes the speed setting from the console for the alpha (some PWSs have broken de chipsets). This is the same behaviour as NetBSD/alpha. Submitted by: Andrew Gallatin <gallatin@cs.duke.edu>
Notes
Notes: svn path=/head/; revision=46356
Diffstat (limited to 'sys/dev/de')
-rw-r--r--sys/dev/de/if_de.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 045d75a5f85a..8728d3992a45 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $ */
-/* $Id: if_de.c,v 1.102 1999/03/17 16:44:52 luigi Exp $ */
+/* $Id: if_de.c,v 1.103 1999/04/24 20:13:59 peter Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5607,10 +5607,10 @@ tulip_pci_attach(
(sc)->tulip_pci_busno = parent; \
(sc)->tulip_pci_devno = pa->pa_device; \
} while (0)
+#endif /* __NetBSD__ */
#if defined(__alpha__)
tulip_media_t media = TULIP_MEDIA_UNKNOWN;
#endif
-#endif /* __NetBSD__ */
int retval, idx;
u_int32_t revinfo, cfdainfo, id;
#if !defined(TULIP_IOMAPPED) && defined(__FreeBSD__)
@@ -5713,7 +5713,7 @@ tulip_pci_attach(
PCI_CONF_WRITE(PCI_CFDA, cfdainfo);
DELAY(11*1000);
}
-#if defined(__alpha__) && defined(__NetBSD__)
+#if defined(__alpha__)
/*
* The Alpha SRM console encodes a console set media in the driver
* part of the CFDA register. Note that the Multia presents a
@@ -5915,11 +5915,11 @@ tulip_pci_attach(
#endif
s = TULIP_RAISESPL();
-#if defined(__alpha__) && defined(__NetBSD__)
+#if defined(__alpha__)
sc->tulip_media = media;
#endif
tulip_attach(sc);
-#if defined(__alpha__) && defined(__NetBSD__)
+#if defined(__alpha__)
if (sc->tulip_media != TULIP_MEDIA_UNKNOWN)
tulip_linkup(sc, media);
#endif