Remove never used code for a BCM5700 feature (BGE_EXTRAM) that didn't

survive past 1st gen silicon.

From brad. Tested by wilfried@ and Johan Mason Lindman.

2 files changed, 20 insertions, 31 deletions

diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 6dcb8944f9b..a66d66f0229 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.201 2006/12/17 06:04:11 krw Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.202 2006/12/22 17:37:50 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -1237,12 +1237,8 @@ bge_blockinit(struct bge_softc *sc)
 
 	/* Configure mbuf memory pool */
 	if (!(BGE_IS_5705_OR_BEYOND(sc))) {
-		if (sc->bge_flags & BGE_EXTRAM)
-			CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR,
-			    BGE_EXT_SSRAM);
-		else
-			CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR,
-			    BGE_BUFFPOOL_1);
+		CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR,
+		    BGE_BUFFPOOL_1);
 
 		if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5704)
 			CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000);
@@ -1313,10 +1309,7 @@ bge_blockinit(struct bge_softc *sc)
 	else
 		rcb->bge_maxlen_flags =
 		    BGE_RCB_MAXLEN_FLAGS(ETHER_MAX_DIX_LEN, 0);
-	if (sc->bge_flags & BGE_EXTRAM)
-		rcb->bge_nicaddr = BGE_EXT_STD_RX_RINGS;
-	else
-		rcb->bge_nicaddr = BGE_STD_RX_RINGS;
+	rcb->bge_nicaddr = BGE_STD_RX_RINGS;
 	CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_HI, rcb->bge_hostaddr.bge_addr_hi);
 	CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_LO, rcb->bge_hostaddr.bge_addr_lo);
 	CSR_WRITE_4(sc, BGE_RX_STD_RCB_MAXLEN_FLAGS, rcb->bge_maxlen_flags);
@@ -1336,10 +1329,7 @@ bge_blockinit(struct bge_softc *sc)
 		rcb->bge_maxlen_flags =
 		    BGE_RCB_MAXLEN_FLAGS(BGE_JUMBO_FRAMELEN,
 		        BGE_RCB_FLAG_RING_DISABLED);
-		if (sc->bge_flags & BGE_EXTRAM)
-			rcb->bge_nicaddr = BGE_EXT_JUMBO_RX_RINGS;
-		else
-			rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS;
+		rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS;
 
 		CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI,
 		    rcb->bge_hostaddr.bge_addr_hi);
diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h
index ab5b8a21054..49a328a627b 100644
--- a/sys/dev/pci/if_bgereg.h
+++ b/sys/dev/pci/if_bgereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bgereg.h,v 1.68 2006/10/22 21:45:36 brad Exp $	*/
+/*	$OpenBSD: if_bgereg.h,v 1.69 2006/12/22 17:37:50 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -2356,21 +2356,20 @@ struct bge_softc {
 #define BGE_TXRING_VALID	0x00000001
 #define BGE_RXRING_VALID	0x00000002
 #define BGE_JUMBO_RXRING_VALID	0x00000004
-#define BGE_EXTRAM		0x00000008	/* Has external SSRAM. */
-#define BGE_TBI			0x00000010
-#define BGE_RX_ALIGNBUG		0x00000020
-#define BGE_NO_3LED		0x00000040
-#define BGE_PCIX		0x00000080
-#define BGE_PCIE		0x00000100
-#define BGE_ASF_MODE		0x00000200
-#define BGE_NO_EEPROM		0x00000400
-#define BGE_JUMBO_CAP		0x00000800
-#define BGE_10_100_ONLY		0x00001000
-#define BGE_PHY_ADC_BUG		0x00002000
-#define BGE_PHY_5704_A0_BUG	0x00004000
-#define BGE_PHY_JITTER_BUG	0x00008000
-#define BGE_PHY_BER_BUG		0x00010000
-#define BGE_NO_ETH_WIRE_SPEED	0x00020000
+#define BGE_TBI			0x00000008
+#define BGE_RX_ALIGNBUG		0x00000010
+#define BGE_NO_3LED		0x00000020
+#define BGE_PCIX		0x00000040
+#define BGE_PCIE		0x00000080
+#define BGE_ASF_MODE		0x00000100
+#define BGE_NO_EEPROM		0x00000200
+#define BGE_JUMBO_CAP		0x00000400
+#define BGE_10_100_ONLY		0x00000800
+#define BGE_PHY_ADC_BUG		0x00001000
+#define BGE_PHY_5704_A0_BUG	0x00002000
+#define BGE_PHY_JITTER_BUG	0x00004000
+#define BGE_PHY_BER_BUG		0x00008000
+#define BGE_NO_ETH_WIRE_SPEED	0x00010000
 
 	bus_dma_tag_t		bge_dmatag;
 	u_int32_t		bge_chipid;