mirror of
				https://review.coreboot.org/flashrom.git
				synced 2025-10-31 13:20:42 +01:00 
			
		
		
		
	Autodetect target processor architecture
Enable architecture dependent compilation of individual sub-drivers for the internal programmer. Corresponding to flashrom svn r1366. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: David Hendricks <dhendrix@google.com>
This commit is contained in:
		
							
								
								
									
										14
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								Makefile
									
									
									
									
									
								
							| @@ -37,7 +37,10 @@ ifeq ($(WARNERROR), yes) | |||||||
| CFLAGS += -Werror | CFLAGS += -Werror | ||||||
| endif | 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) | OS_ARCH	?= $(shell uname) | ||||||
| ifneq ($(OS_ARCH), SunOS) | ifneq ($(OS_ARCH), SunOS) | ||||||
| STRIP_ARGS = -s | STRIP_ARGS = -s | ||||||
| @@ -304,8 +307,10 @@ endif | |||||||
| ifeq ($(CONFIG_INTERNAL), yes) | ifeq ($(CONFIG_INTERNAL), yes) | ||||||
| FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' | FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' | ||||||
| PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o | 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 | PROGRAMMER_OBJS += it87spi.o it85spi.o ichspi.o sb600spi.o wbsio_spi.o mcp6x_spi.o | ||||||
|  | else | ||||||
|  | endif | ||||||
| NEED_PCI := yes | NEED_PCI := yes | ||||||
| endif | endif | ||||||
|  |  | ||||||
| @@ -500,6 +505,11 @@ compiler: featuresavailable | |||||||
| 		echo "found." || ( echo "not found."; \ | 		echo "found." || ( echo "not found."; \ | ||||||
| 		rm -f .test.c .test$(EXEC_SUFFIX); exit 1) | 		rm -f .test.c .test$(EXEC_SUFFIX); exit 1) | ||||||
| 	@rm -f .test.c .test$(EXEC_SUFFIX) | 	@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) | ifeq ($(CHECK_LIBPCI), yes) | ||||||
| pciutils: compiler | pciutils: compiler | ||||||
|   | |||||||
							
								
								
									
										31
									
								
								arch.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								arch.h
									
									
									
									
									
										Normal file
									
								
							| @@ -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__ | ||||||
		Reference in New Issue
	
	Block a user
	 Carl-Daniel Hailfinger
					Carl-Daniel Hailfinger