[U-Boot-Users] [PATCH] New PCI device ID for E1000 (82545GM)

[Paul Gortmaker <paul.gortmaker@windriver.com>]

As part of testing PCI on the SBC8349, I noticed the intel e1000 variant
I had (an 82545GM) wasn't in the PCI ID or in the e1000 driver.  It
appears that because this is just another variant of the 82545, that
all that is required is simply adding the IDs in -- at least it works
fine for me.

Thanks,
Paul.

--------
U-Boot 1.1.6 (Nov 16 2006 - 16:40:19) MPC83XX

Clock configuration:
  Coherent System Bus:  264 MHz
  Core:                 396 MHz
  Local Bus:             66 MHz
CPU:   MPC83xx, Rev: 1.1 at 396 MHz
Board: Wind River SBC834x
I2C:   ready
DRAM:  Initializing
[U-Boot configured to ignore LB-SDRAM]   DDR RAM: 256 MB
FLASH:  8 MB
In:    serial
Out:   serial
Err:   serial
Net:   e1000: 00:04:23:ba:f8:2f
TSEC0, TSEC1, e1000#0
SBC834x=> ping $serverip
Enet starting in 100BT/FD
Speed: 100, full duplex
Using TSEC0 device
host 121.244.158.9 is alive
SBC834x=> sete ethact e1000#0
SBC834x=> ping $serverip
Using e1000#0 device
host 121.244.158.9 is alive
SBC834x=>
--------

diff -urN u-boot-1.1.6-orig/drivers/e1000.c u-boot-1.1.6/drivers/e1000.c
--- u-boot-1.1.6-orig/drivers/e1000.c	2006-11-02 09:15:01.000000000 -0500
+++ u-boot-1.1.6/drivers/e1000.c	2006-11-16 16:40:16.000000000 -0500
@@ -78,6 +78,7 @@
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82544GC_LOM},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82540EM},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82545EM_COPPER},
+	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82545GM_COPPER},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82546EB_COPPER},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82545EM_FIBER},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82546EB_FIBER},
@@ -632,6 +633,7 @@
 		hw->mac_type = e1000_82540;
 		break;
 	case E1000_DEV_ID_82545EM_COPPER:
+	case E1000_DEV_ID_82545GM_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 		hw->mac_type = e1000_82545;
 		break;
diff -urN u-boot-1.1.6-orig/drivers/e1000.h u-boot-1.1.6/drivers/e1000.h
--- u-boot-1.1.6-orig/drivers/e1000.h	2006-11-02 09:15:01.000000000 -0500
+++ u-boot-1.1.6/drivers/e1000.h	2006-11-16 16:34:46.000000000 -0500
@@ -204,10 +204,11 @@
 #define E1000_DEV_ID_82540EM        0x100E
 #define E1000_DEV_ID_82540EM_LOM    0x1015
 #define E1000_DEV_ID_82545EM_COPPER 0x100F
+#define E1000_DEV_ID_82545GM_COPPER 0x1026
 #define E1000_DEV_ID_82545EM_FIBER  0x1011
 #define E1000_DEV_ID_82546EB_COPPER 0x1010
 #define E1000_DEV_ID_82546EB_FIBER  0x1012
-#define NUM_DEV_IDS 13
+#define NUM_DEV_IDS 14
 
 #define NODE_ADDRESS_SIZE 6
 #define ETH_LENGTH_OF_ADDRESS 6
diff -urN u-boot-1.1.6-orig/include/pci_ids.h u-boot-1.1.6/include/pci_ids.h
--- u-boot-1.1.6-orig/include/pci_ids.h	2006-11-02 09:15:01.000000000 -0500
+++ u-boot-1.1.6/include/pci_ids.h	2006-11-16 16:37:15.000000000 -0500
@@ -1823,6 +1823,7 @@
 #define PCI_DEVICE_ID_INTEL_82545EM_FIBER	0x1011
 #define PCI_DEVICE_ID_INTEL_82546EB_FIBER	0x1012
 #define PCI_DEVICE_ID_INTEL_82540EM_LOM		0x1015
+#define PCI_DEVICE_ID_INTEL_82545GM_COPPER	0x1026
 #define PCI_DEVICE_ID_INTEL_82559		0x1030
 
 #define PCI_DEVICE_ID_INTEL_82562ET	0x1031