summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-02-12 19:35:25 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-02-12 19:35:25 +0000
commitfb0828f3db2b6c298b5617690a70cc92f34f3287 (patch)
tree4377b78675ae61d7d79b2eefa270aa957cae8379 /Makefile
parentca33140ebf2ea7b09f03717fc29ee3369c99d3d2 (diff)
downloadflashrom-fb0828f3db2b6c298b5617690a70cc92f34f3287.tar.gz
flashrom-fb0828f3db2b6c298b5617690a70cc92f34f3287.tar.bz2
flashrom-fb0828f3db2b6c298b5617690a70cc92f34f3287.zip
Split internal.c into internal.c and hwaccess.c
Linking in support for the internal programmer doesn't make sense if you only need hardware (ioport, memory) access. Note: This patch was created by "svn cp internal.c hwaccess.c" and then removing stuff from both files. That's why you can't apply the patch as-is before running the svn cp. Corresponding to flashrom svn r898. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Sean Nelson <audiohacked@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 62c6a74f4..e998ce98c 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ CONFIG_PRINT_WIKI ?= no
ifeq ($(CONFIG_INTERNAL), yes)
FEATURE_CFLAGS += -D'INTERNAL_SUPPORT=1'
-PROGRAMMER_OBJS += chipset_enable.o board_enable.o cbtable.o dmi.o it87spi.o ichspi.o sb600spi.o wbsio_spi.o
+PROGRAMMER_OBJS += chipset_enable.o board_enable.o cbtable.o dmi.o it87spi.o ichspi.o sb600spi.o wbsio_spi.o internal.o
NEED_PCI := yes
endif
@@ -180,12 +180,7 @@ endif
ifeq ($(NEED_PCI), yes)
LIBS += -lpci
FEATURE_CFLAGS += -D'NEED_PCI=1'
-PROGRAMMER_OBJS += pcidev.o physmap.o internal.o #FIXME: We need to move stuff
- # from internal.c and pcidev.c to pci.c
- # internal.c needs to be split
- # into internal-programmer-only stuff
- # and a support lib for all internal+pci
- # based stuff.
+PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o
ifeq ($(OS_ARCH), NetBSD)
LIBS += -lpciutils # The libpci we want.
LIBS += -l$(shell uname -m) # For (i386|x86_64)_iopl(2).