[flashrom] [commit] r1366 - trunk

[repository service]

Author: hailfinger
Date: Thu Jul  7 08:59:18 2011
New Revision: 1366
URL: http://flashrom.org/trac/flashrom/changeset/1366

Log:
Autodetect target processor architecture.
Enable architecture dependent compilation of individual sub-drivers for
the internal programmer.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: David Hendricks

Added:
   trunk/arch.h
Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Jul  7 06:10:57 2011	(r1365)
+++ trunk/Makefile	Thu Jul  7 08:59:18 2011	(r1366)
@@ -37,7 +37,10 @@
 CFLAGS += -Werror
 endif

-# FIXME We have to differentiate between host and target arch.
+# Determine the destination processor architecture
+override ARCH = $(strip $(shell LC_ALL=C $(CC) -E arch.h|grep -v '^#'))
+
+# FIXME We have to differentiate between host and target OS architecture.
 OS_ARCH	?= $(shell uname)
 ifneq ($(OS_ARCH), SunOS)
 STRIP_ARGS = -s
@@ -304,8 +307,10 @@
 ifeq ($(CONFIG_INTERNAL), yes)
 FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1'
 PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o
-# FIXME: The PROGRAMMER_OBJS below should only be included on x86.
+ifeq ($(ARCH),"x86")
 PROGRAMMER_OBJS += it87spi.o it85spi.o ichspi.o sb600spi.o wbsio_spi.o mcp6x_spi.o
+else
+endif
 NEED_PCI := yes
 endif

@@ -500,6 +505,11 @@
    	echo "found." || ( echo "not found."; \
    	rm -f .test.c .test$(EXEC_SUFFIX); exit 1)
    @rm -f .test.c .test$(EXEC_SUFFIX)
+	@printf "ARCH is "
+	@# FreeBSD wc will output extraneous whitespace.
+	@echo $(ARCH)|wc -l|grep -q '^[[:blank:]]*1[[:blank:]]*$$' ||	\
+		( echo "unknown. Aborting."; exit 1)
+	@printf "%s\n" '$(ARCH)'

ifeq ($(CHECK_LIBPCI), yes)
 pciutils: compiler

Added: trunk/arch.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/arch.h	Thu Jul  7 08:59:18 2011	(r1366)
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the flashrom project.
+ *
+ * Copyright (C) 2011 Carl-Daniel Hailfinger
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+/*
+ * Header file for CPU architecture checking.
+ */
+
+#if defined (__i386__) || defined (__x86_64__)
+#define __FLASHROM_ARCH__ "x86"
+#elif defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips)
+#define __FLASHROM_ARCH__ "mips"
+#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__)
+#define __FLASHROM_ARCH__ "ppc"
+#endif
+__FLASHROM_ARCH__