summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/re.c38
-rw-r--r--sys/dev/microcode/atmel/Makefile4
-rw-r--r--sys/dev/microcode/kue/Makefile4
-rw-r--r--sys/dev/microcode/ral/Makefile4
-rw-r--r--sys/dev/microcode/rum/Makefile4
-rw-r--r--sys/dev/microcode/tusb3410/Makefile4
-rw-r--r--sys/dev/microcode/udl/Makefile4
-rw-r--r--sys/dev/microcode/zydas/Makefile4
8 files changed, 15 insertions, 51 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index 16512c695fd..13fbfa1dea1 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.192 2016/04/20 12:15:24 sthen Exp $ */
+/* $OpenBSD: re.c,v 1.193 2016/08/10 14:27:17 deraadt Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -644,18 +644,6 @@ re_reset(struct rl_softc *sc)
CSR_WRITE_1(sc, RL_LDPS, 1);
}
-#ifdef __armish__
-/*
- * Thecus N2100 doesn't store the full mac address in eeprom
- * so we read the old mac address from the device before the reset
- * in hopes that the proper mac address is already there.
- */
-union {
- u_int32_t eaddr_word[2];
- u_char eaddr[ETHER_ADDR_LEN];
-} boot_eaddr;
-int boot_eaddr_valid;
-#endif /* __armish__ */
/*
* Attach the interface. Allocate softc structures, do ifmedia
* setup and ethernet/BPF attach.
@@ -877,30 +865,6 @@ re_attach(struct rl_softc *sc, const char *intrstr)
for (i = 0; i < ETHER_ADDR_LEN / 2; i++)
as[i] = letoh16(as[i]);
bcopy(as, eaddr, ETHER_ADDR_LEN);
-
-#ifdef __armish__
- /*
- * On the Thecus N2100, the MAC address in the EEPROM is
- * always 00:14:fd:10:00:00. The proper MAC address is
- * stored in flash. Fortunately RedBoot configures the
- * proper MAC address (for the first onboard interface)
- * which we can read from the IDR.
- */
- if (eaddr[0] == 0x00 && eaddr[1] == 0x14 &&
- eaddr[2] == 0xfd && eaddr[3] == 0x10 &&
- eaddr[4] == 0x00 && eaddr[5] == 0x00) {
- if (boot_eaddr_valid == 0) {
- boot_eaddr.eaddr_word[1] =
- letoh32(CSR_READ_4(sc, RL_IDR4));
- boot_eaddr.eaddr_word[0] =
- letoh32(CSR_READ_4(sc, RL_IDR0));
- boot_eaddr_valid = 1;
- }
-
- bcopy(boot_eaddr.eaddr, eaddr, sizeof(eaddr));
- eaddr[5] += sc->sc_dev.dv_unit;
- }
-#endif
}
/*
diff --git a/sys/dev/microcode/atmel/Makefile b/sys/dev/microcode/atmel/Makefile
index 05753f83a3f..3288d05ee55 100644
--- a/sys/dev/microcode/atmel/Makefile
+++ b/sys/dev/microcode/atmel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.22 2016/08/10 14:27:17 deraadt Exp $
NOPROG=
NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
# USB capable systems only
.if (${MACHINE_ARCH} == "powerpc" || \
${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+ ${MACHINE} == "armv7" || \
${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/kue/Makefile b/sys/dev/microcode/kue/Makefile
index 4ccd4826651..f4525e26531 100644
--- a/sys/dev/microcode/kue/Makefile
+++ b/sys/dev/microcode/kue/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.15 2016/08/10 14:27:17 deraadt Exp $
NOPROG=
NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
# USB capable systems only
.if (${MACHINE_ARCH} == "powerpc" || \
${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+ ${MACHINE} == "armv7" || \
${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/ral/Makefile b/sys/dev/microcode/ral/Makefile
index 5fc6df631b2..3276fce6d8b 100644
--- a/sys/dev/microcode/ral/Makefile
+++ b/sys/dev/microcode/ral/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.11 2016/08/10 14:27:17 deraadt Exp $
NOPROG=
NOMAN=
@@ -6,7 +6,7 @@ CC=${HOSTCC}
# PCI capable systems only
.if (${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "armish" || ${MACHINE} == "hppa" || \
+ ${MACHINE} == "hppa" || \
${MACHINE} == "i386" || \
${MACHINE} == "loongson" || ${MACHINE} == "octeon" || \
${MACHINE_ARCH} == "powerpc" || \
diff --git a/sys/dev/microcode/rum/Makefile b/sys/dev/microcode/rum/Makefile
index 00f044292c0..994274d4e27 100644
--- a/sys/dev/microcode/rum/Makefile
+++ b/sys/dev/microcode/rum/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.15 2016/08/10 14:27:17 deraadt Exp $
NOPROG=
NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
# USB capable systems only
.if (${MACHINE_ARCH} == "powerpc" || \
${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+ ${MACHINE} == "armv7" || \
${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/tusb3410/Makefile b/sys/dev/microcode/tusb3410/Makefile
index 0f4cd95d6a1..9909aa2cd89 100644
--- a/sys/dev/microcode/tusb3410/Makefile
+++ b/sys/dev/microcode/tusb3410/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.9 2016/08/10 14:27:17 deraadt Exp $
NOPROG=
NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
# USB capable systems only
.if (${MACHINE_ARCH} == "powerpc" || \
${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+ ${MACHINE} == "armv7" || \
${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/udl/Makefile b/sys/dev/microcode/udl/Makefile
index d2f24219590..67939419450 100644
--- a/sys/dev/microcode/udl/Makefile
+++ b/sys/dev/microcode/udl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.8 2016/08/10 14:27:17 deraadt Exp $
NOPROG=
NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
# USB capable systems only
.if (${MACHINE_ARCH} == "powerpc" || \
${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+ ${MACHINE} == "armv7" || \
${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/zydas/Makefile b/sys/dev/microcode/zydas/Makefile
index 42b877bd381..7da7e298363 100644
--- a/sys/dev/microcode/zydas/Makefile
+++ b/sys/dev/microcode/zydas/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.14 2016/08/10 14:27:17 deraadt Exp $
NOPROG=
NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
# USB capable systems only
.if (${MACHINE_ARCH} == "powerpc" || \
${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+ ${MACHINE} == "armv7" || \
${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:39:19 +0000