From b713d2e35c5336da81f5fbc83393961d1d8aa7bd Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sun, 8 May 2011 00:24:18 +0000 Subject: Intel NIC with parallel flash support Tested-by: Maciej Pijanka Corresponding to flashrom svn r1297. Signed-off-by: Carl-Daniel Hailfinger Tested-by: Anton Kochkov Acked-by: Anton Kochkov --- flashrom.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 1083abe..f18828c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -52,7 +52,7 @@ enum programmer programmer = PROGRAMMER_DUMMY; * if more than one of them is selected. If only one is selected, it is clear * 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+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV > 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+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV > 1 #error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all programmers except one. #endif enum programmer programmer = @@ -92,6 +92,9 @@ enum programmer programmer = #if CONFIG_RAYER_SPI == 1 PROGRAMMER_RAYER_SPI #endif +#if CONFIG_NICINTEL == 1 + PROGRAMMER_NICINTEL +#endif #if CONFIG_NICINTEL_SPI == 1 PROGRAMMER_NICINTEL_SPI #endif @@ -390,6 +393,25 @@ const struct programmer_entry programmer_table[] = { }, #endif +#if CONFIG_NICINTEL == 1 + { + .name = "nicintel", + .init = nicintel_init, + .shutdown = nicintel_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = nicintel_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = nicintel_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, + }, +#endif + #if CONFIG_NICINTEL_SPI == 1 { .name = "nicintel_spi", -- cgit v1.1