Changeset 691 for trunk/flash.h

Timestamp:

Aug 19, 2009 3:27:58 PM (4 years ago)

Author:

hailfinger

Message:

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@…>
Acked-by: Stefan Reinauer <stepan@…>

File:

• trunk/flash.h (modified) (2 diffs)

trunk/flash.h

@@ -87 +87 @@
         PROGRAMMER_SATASII,
         PROGRAMMER_IT87SPI,
+#if FT2232_SPI_SUPPORT == 1
         PROGRAMMER_FT2232SPI,
+#endif
 #if SERPROG_SUPPORT == 1
         PROGRAMMER_SERPROG,
@@ -437 +439 @@
         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;