From 8868db37b7f9d7408161cc55bd6566f338762cb0 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Tue, 13 Mar 2012 00:18:19 +0000 Subject: 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 , which led to a hopefully more robust check. Corresponding to flashrom svn r1517. Signed-off-by: Stefan Tauner Acked-by: Michael Karcher --- Makefile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c921a749..4de89e0c 100644 --- a/Makefile +++ b/Makefile @@ -485,7 +485,8 @@ NEED_PCI := yes 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 @@ int main(int argc, char **argv) endef export UTSNAME_TEST +define LINUX_SPI_TEST +#include +#include + +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) @@ -679,6 +693,13 @@ ifeq ($(CONFIG_FT2232_SPI), yes) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ ( 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 -- cgit v1.2.3