[commit] r1517 - trunk

[repository service]

Author: stefanct
Date: Tue Mar 13 01:18:19 2012
New Revision: 1517
URL: http://flashrom.org/trac/flashrom/changeset/1517

Log:
Make the presence of Linux SPI headers mandatory for linux_spi.

This solution is copied from ft2232_spi and is equally hacky.
Thanks to M.K. for investigating the history of <linux/spi/spidev.h>, which
led to a hopefully more robust check.

Signed-off-by: Stefan Tauner 
Acked-by: Michael Karcher

Modified:
   trunk/Makefile
   trunk/linux_spi.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sat Mar 10 20:22:13 2012	(r1516)
+++ trunk/Makefile	Tue Mar 13 01:18:19 2012	(r1517)
@@ -485,7 +485,8 @@
 endif

ifeq ($(CONFIG_LINUX_SPI), yes)
-FEATURE_CFLAGS += -D'CONFIG_LINUX_SPI=1'
+# This is a totally ugly hack.
+FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "LINUX_SPI_SUPPORT := yes" .features && printf "%s" "-D'CONFIG_LINUX_SPI=1'")
 PROGRAMMER_OBJS += linux_spi.o
 endif

@@ -671,6 +672,19 @@
 endef
 export UTSNAME_TEST

+define LINUX_SPI_TEST
+#include <linux/types.h>
+#include <linux/spi/spidev.h>
+
+int main(int argc, char **argv)
+{
+	(void) argc;
+	(void) argv;
+	return 0;
+}
+endef
+export LINUX_SPI_TEST
+
 features: compiler
    @echo "FEATURES := yes" > .features.tmp
 ifeq ($(CONFIG_FT2232_SPI), yes)
@@ -680,6 +694,13 @@
    	( echo "found."; echo "FTDISUPPORT := yes" >> .features.tmp ) ||	\
    	( echo "not found."; echo "FTDISUPPORT := no" >> .features.tmp )
 endif
+ifeq ($(CONFIG_LINUX_SPI), yes)
+	@printf "Checking if Linux SPI headers are present... "
+	@echo "$$LINUX_SPI_TEST" > .featuretest.c
+	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) >/dev/null 2>&1 &&	\
+		( echo "yes."; echo "LINUX_SPI_SUPPORT := yes" >> .features.tmp ) ||	\
+		( echo "no."; echo "LINUX_SPI_SUPPORT := no" >> .features.tmp )
+endif
    @printf "Checking for utsname support... "
    @echo "$$UTSNAME_TEST" > .featuretest.c
    @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) >/dev/null 2>&1 &&	\

Modified: trunk/linux_spi.c
==============================================================================
--- trunk/linux_spi.c	Sat Mar 10 20:22:13 2012	(r1516)
+++ trunk/linux_spi.c	Tue Mar 13 01:18:19 2012	(r1517)
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */

+#if CONFIG_LINUX_SPI == 1
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -24,6 +26,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <linux/types.h>
 #include <linux/spi/spidev.h>
 #include <sys/ioctl.h>
 #include "flash.h"
@@ -176,3 +179,5 @@
    return spi_write_chunked(flash, buf, start, len,
    			((unsigned int)getpagesize()) - 4);
 }
+
+#endif // CONFIG_LINUX_SPI == 1