openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-05-01 00:43:40 +02:00
Code Issues Releases Wiki Activity

We already have NEED_PCI in the Makefile to link in PCI support

Browse Source 
Add NEED_SERIAL and NEED_NET to decouple individual drivers from
compilation and linking decisions. Move libgetopt from a DOS+PCI
dependency to a DOS dependency to fix linking on DOS if no driver
requiring PCI is enabled.

Corresponding to flashrom svn r1044.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Carl-Daniel Hailfinger 2010-06-14 12:42:05 +00:00
parent 89bed6d836
commit 5bdf298439
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -50,6 +50,8 @@ LDFLAGS += -L/usr/local/lib
endif endif
ifeq ($(OS_ARCH), DOS) ifeq ($(OS_ARCH), DOS)
CPPFLAGS += -I../libgetopt -I../libpci/include CPPFLAGS += -I../libgetopt -I../libpci/include
# FIXME Check if we can achieve the same effect with -L../libgetopt -lgetopt
LIBS += ../libgetopt/libgetopt.a
# Bus Pirate and Serprog are not supported under DOS. # Bus Pirate and Serprog are not supported under DOS.
CONFIG_BUSPIRATE_SPI = no CONFIG_BUSPIRATE_SPI = no
CONFIG_SERPROG = no CONFIG_SERPROG = no
@ -136,9 +138,8 @@ endif
ifeq ($(CONFIG_SERPROG), yes) ifeq ($(CONFIG_SERPROG), yes)
FEATURE_CFLAGS += -D'CONFIG_SERPROG=1' FEATURE_CFLAGS += -D'CONFIG_SERPROG=1'
PROGRAMMER_OBJS += serprog.o PROGRAMMER_OBJS += serprog.o
ifeq ($(OS_ARCH), SunOS) NEED_SERIAL := yes
LIBS += -lsocket NEED_NET := yes
endif
endif endif
ifeq ($(CONFIG_BITBANG_SPI), yes) ifeq ($(CONFIG_BITBANG_SPI), yes)
@ -204,6 +205,7 @@ endif
ifeq ($(CONFIG_BUSPIRATE_SPI), yes) ifeq ($(CONFIG_BUSPIRATE_SPI), yes)
FEATURE_CFLAGS += -D'CONFIG_BUSPIRATE_SPI=1' FEATURE_CFLAGS += -D'CONFIG_BUSPIRATE_SPI=1'
PROGRAMMER_OBJS += buspirate_spi.o PROGRAMMER_OBJS += buspirate_spi.o
NEED_SERIAL := yes
endif endif
ifeq ($(CONFIG_DEDIPROG), yes) ifeq ($(CONFIG_DEDIPROG), yes)
@ -212,20 +214,18 @@ FEATURE_LIBS += -lusb
PROGRAMMER_OBJS += dediprog.o PROGRAMMER_OBJS += dediprog.o
endif endif
# Ugly, but there's no elif/elseif. ifeq ($(NEED_SERIAL), yes)
ifeq ($(CONFIG_SERPROG), yes)
LIB_OBJS += serial.o
else
ifeq ($(CONFIG_BUSPIRATE_SPI), yes)
LIB_OBJS += serial.o LIB_OBJS += serial.o
endif endif
ifeq ($(NEED_NET), yes)
ifeq ($(OS_ARCH), SunOS)
LIBS += -lsocket
endif
endif endif
ifeq ($(NEED_PCI), yes) ifeq ($(NEED_PCI), yes)
CHECK_LIBPCI = yes CHECK_LIBPCI = yes
endif
ifeq ($(NEED_PCI), yes)
FEATURE_CFLAGS += -D'NEED_PCI=1' FEATURE_CFLAGS += -D'NEED_PCI=1'
PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o
ifeq ($(OS_ARCH), NetBSD) ifeq ($(OS_ARCH), NetBSD)
@ -236,7 +236,7 @@ LIBS += -l$(shell uname -p)
else else
ifeq ($(OS_ARCH), DOS) ifeq ($(OS_ARCH), DOS)
# FIXME There needs to be a better way to do this # FIXME There needs to be a better way to do this
LIBS += ../libpci/lib/libpci.a ../libgetopt/libgetopt.a LIBS += ../libpci/lib/libpci.a
else else
LIBS += -lpci LIBS += -lpci
endif endif