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.

Corresponding to flashrom svn r691.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>

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;