summaryrefslogtreecommitdiff
path: root/flash.h
diff options
context:
space:
mode:
authorhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2009-08-19 13:27:58 +0000
committerhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2009-08-19 13:27:58 +0000
commit96fbb9d7a6c6c0d92dc01eb617ec8929f679294b (patch)
tree78525e6b9821679dbf87c69dc56c8af7182e04c2 /flash.h
parent1c199d351e7f983fce1cc48c215594957a39b861 (diff)
downloadflashrom-96fbb9d7a6c6c0d92dc01eb617ec8929f679294b.tar.gz
If FT2232H SPI is not enabled, it should be compiled out completely. We
can't remove ft2232_spi.o from unconditional OBJS yet due to our makefile structure (make features), but this patch adds #ifdefs around all FT2232H code, so the net effect is the same. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@691 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'flash.h')
-rw-r--r--flash.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/flash.h b/flash.h
index a571be7..c5234dc 100644
--- a/flash.h
+++ b/flash.h
@@ -86,7 +86,9 @@ enum programmer {
PROGRAMMER_NIC3COM,
PROGRAMMER_SATASII,
PROGRAMMER_IT87SPI,
+#if FT2232_SPI_SUPPORT == 1
PROGRAMMER_FT2232SPI,
+#endif
#if SERPROG_SUPPORT == 1
PROGRAMMER_SERPROG,
#endif
@@ -436,9 +438,13 @@ enum spi_controller {
SPI_CONTROLLER_SB600,
SPI_CONTROLLER_VIA,
SPI_CONTROLLER_WBSIO,
+#if FT2232_SPI_SUPPORT == 1
SPI_CONTROLLER_FT2232,
+#endif
SPI_CONTROLLER_DUMMY,
+ SPI_CONTROLLER_INVALID /* This must always be the last entry. */
};
+extern const int spi_programmer_count;
struct spi_command {
unsigned int writecnt;
unsigned int readcnt;