Changeset 1151 for trunk/programmer.h

Timestamp:

09/03/10 20:21:21 (21 months ago)

Author:

uwe

Message:

Add Intel Gigabit NIC SPI flashing support.
Tested on a 82541PI (0x8086, 0x107c) using 32-bit hardware.

The last line in nicintel_request_spibus() could be changed so that FL_BUSY
is used instead.

Shortened sample log:
[...]
Found "Intel 82541PI Gigabit Ethernet Controller" (8086:107c, BDF 01:03.0).
Found chip "ST M25P10.RES" (128 KB, SPI) at physical address 0xfffe0000.
Multiple flash chips were detected: M25P05.RES M25P10.RES
Please specify which chip to use with the -c <chipname> option.
[...]

Signed-off-by: Idwer Vollering <vidwer@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/programmer.h (modified) (6 diffs)

trunk/programmer.h

@@ -38 +38 @@
         PROGRAMMER_NICREALTEK,
         PROGRAMMER_NICREALTEK2,
-#endif  
+#endif
 #if CONFIG_NICNATSEMI == 1
         PROGRAMMER_NICNATSEMI,
-#endif  
+#endif
 #if CONFIG_GFXNVIDIA == 1
         PROGRAMMER_GFXNVIDIA,
@@ -73 +73 @@
 #if CONFIG_RAYER_SPI == 1
         PROGRAMMER_RAYER_SPI,
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        PROGRAMMER_NICINTEL_SPI,
 #endif
         PROGRAMMER_INVALID /* This must always be the last entry. */
@@ -110 +113 @@
 #if CONFIG_RAYER_SPI == 1
         BITBANG_SPI_MASTER_RAYER,
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        BITBANG_SPI_MASTER_NICINTEL,
 #endif
 #if CONFIG_INTERNAL == 1
@@ -208 +214 @@
 
 /* print.c */
-#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT >= 1
+#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL_SPI >= 1
 void print_supported_pcidevs(const struct pcidev_status *devs);
 #endif
@@ -379 +385 @@
 #endif
 
+/* nicintel_spi.c */
+#if CONFIG_NICINTEL_SPI == 1
+int nicintel_spi_init(void);
+int nicintel_spi_shutdown(void);
+int nicintel_spi_send_command(unsigned int writecnt, unsigned int readcnt,
+        const unsigned char *writearr, unsigned char *readarr);
+void nicintel_spi_chip_writeb(uint8_t val, chipaddr addr);
+extern const struct pcidev_status nics_intel_spi[];
+#endif
+
 /* satasii.c */
 #if CONFIG_SATASII == 1
@@ -494 +510 @@
 #if CONFIG_RAYER_SPI == 1
         SPI_CONTROLLER_RAYER,
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        SPI_CONTROLLER_NICINTEL,
 #endif
         SPI_CONTROLLER_INVALID /* This must always be the last entry. */