From 3426ef6ab8dc13a0f1c306ab5d63e27664fb3e5c Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 19 Aug 2009 13:27:58 +0000 Subject: 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 Acked-by: Stefan Reinauer --- flashrom.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index acdb38b..fb45bd0 100644 --- a/flashrom.c +++ b/flashrom.c @@ -122,6 +122,7 @@ const struct programmer_entry programmer_table[] = { .delay = internal_delay, }, +#if FT2232_SPI_SUPPORT == 1 { .name = "ft2232spi", .init = ft2232_spi_init, @@ -138,6 +139,7 @@ const struct programmer_entry programmer_table[] = { .chip_writen = fallback_chip_writen, .delay = internal_delay, }, +#endif #if SERPROG_SUPPORT == 1 { @@ -610,6 +612,10 @@ int main(int argc, char *argv[]) fprintf(stderr, "Programmer table miscompilation!\n"); exit(1); } + if (spi_programmer_count - 1 != SPI_CONTROLLER_INVALID) { + fprintf(stderr, "SPI programmer table miscompilation!\n"); + exit(1); + } setbuf(stdout, NULL); while ((opt = getopt_long(argc, argv, "rRwvnVEfc:m:l:i:p:Lzh", -- cgit v1.1