Changeset 691 for trunk/spi.c

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/spi.c (modified) (4 diffs)

trunk/spi.c

@@ -83 +83 @@
         },
 
+#if FT2232_SPI_SUPPORT == 1
         { /* SPI_CONTROLLER_FT2232 */
                 .command = ft2232_spi_send_command,
@@ -89 +90 @@
                 .write_256 = ft2232_spi_write_256,
         },
+#endif
 
         { /* SPI_CONTROLLER_DUMMY */
@@ -96 +98 @@
                 .write_256 = NULL,
         },
+
+        {}, /* This entry corresponds to SPI_CONTROLLER_INVALID. */
 };
 
+const int spi_programmer_count = ARRAY_SIZE(spi_programmer);
 
 int spi_send_command(unsigned int writecnt, unsigned int readcnt,
@@ -294 +299 @@
         case SPI_CONTROLLER_SB600:
         case SPI_CONTROLLER_WBSIO:
+#if FT2232_SPI_SUPPORT == 1
         case SPI_CONTROLLER_FT2232:
+#endif
         case SPI_CONTROLLER_DUMMY:
                 return probe_spi_rdid_generic(flash, 4);