Changeset 1151 for trunk/flashrom.c

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/flashrom.c (modified) (3 diffs)

trunk/flashrom.c

@@ -50 +50 @@
  * that the user wants that one to become the default.
  */
-#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI > 1
+#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI+CONFIG_NICINTEL_SPI > 1
 #error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all programmers except one.
 #endif
@@ -90 +90 @@
 #if CONFIG_RAYER_SPI == 1
         PROGRAMMER_RAYER_SPI
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        PROGRAMMER_NICINTEL_SPI
 #endif
 ;
@@ -412 +415 @@
                 .chip_writen            = fallback_chip_writen,
                 .delay                  = internal_delay,
+        },
+#endif
+
+#if CONFIG_NICINTEL_SPI == 1
+        {
+                .name = "nicintel_spi",
+                .init = nicintel_spi_init,
+                .shutdown = nicintel_spi_shutdown,
+                .map_flash_region = fallback_map,
+                .unmap_flash_region = fallback_unmap,
+                .chip_readb = noop_chip_readb,
+                .chip_readw = fallback_chip_readw,
+                .chip_readl = fallback_chip_readl,
+                .chip_readn = fallback_chip_readn,
+                .chip_writeb = noop_chip_writeb,
+                .chip_writew = fallback_chip_writew,
+                .chip_writel = fallback_chip_writel,
+                .chip_writen = fallback_chip_writen,
+                .delay = internal_delay,
         },
 #endif