Change in flashrom[master]: Makefile: build shared pci code as part of the programmer

[Thomas Heijligen (Code Review)]

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62835 )

Change subject: Makefile: build shared pci code as part of the programmer
......................................................................

Makefile: build shared pci code as part of the programmer

Change-Id: I18a54cb0f728a670cc16b67c72e891d26918db19
Signed-off-by: Thomas Heijligen 
---
M Makefile
1 file changed, 18 insertions(+), 18 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/35/62835/1

diff --git a/Makefile b/Makefile
index def0322..9a59538 100644
--- a/Makefile
+++ b/Makefile
@@ -580,12 +580,13 @@
 FEATURE_FLAGS += -D'CONFIG_INTERNAL=1'
 PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o \
    internal.o it87spi.o it85spi.o sb600spi.o amd_imc.o wbsio_spi.o mcp6x_spi.o \
-	ichspi.o dmi.o
+	ichspi.o dmi.o pcidev.o
 endif
 else
 ifeq ($(CONFIG_INTERNAL), yes)
 FEATURE_FLAGS += -D'CONFIG_INTERNAL=1'
-PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o internal.o
+PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o \
+	internal.o pcidev.o
 endif
 endif

@@ -620,37 +621,37 @@

ifeq ($(CONFIG_NIC3COM), yes)
 FEATURE_FLAGS += -D'CONFIG_NIC3COM=1'
-PROGRAMMER_OBJS += nic3com.o
+PROGRAMMER_OBJS += nic3com.o pcidev.o
 endif

ifeq ($(CONFIG_GFXNVIDIA), yes)
 FEATURE_FLAGS += -D'CONFIG_GFXNVIDIA=1'
-PROGRAMMER_OBJS += gfxnvidia.o
+PROGRAMMER_OBJS += gfxnvidia.o pcidev.o
 endif

ifeq ($(CONFIG_SATASII), yes)
 FEATURE_FLAGS += -D'CONFIG_SATASII=1'
-PROGRAMMER_OBJS += satasii.o
+PROGRAMMER_OBJS += satasii.o pcidev.o
 endif

ifeq ($(CONFIG_ATAHPT), yes)
 FEATURE_FLAGS += -D'CONFIG_ATAHPT=1'
-PROGRAMMER_OBJS += atahpt.o
+PROGRAMMER_OBJS += atahpt.o pcidev.o
 endif

ifeq ($(CONFIG_ATAVIA), yes)
 FEATURE_FLAGS += -D'CONFIG_ATAVIA=1'
-PROGRAMMER_OBJS += atavia.o
+PROGRAMMER_OBJS += atavia.o pcidev.o
 endif

ifeq ($(CONFIG_ATAPROMISE), yes)
 FEATURE_FLAGS += -D'CONFIG_ATAPROMISE=1'
-PROGRAMMER_OBJS += atapromise.o
+PROGRAMMER_OBJS += atapromise.o pcidev.o
 endif

ifeq ($(CONFIG_IT8212), yes)
 FEATURE_FLAGS += -D'CONFIG_IT8212=1'
-PROGRAMMER_OBJS += it8212.o
+PROGRAMMER_OBJS += it8212.o pcidev.o
 endif

ifeq ($(CONFIG_FT2232_SPI), yes)
@@ -695,37 +696,37 @@

ifeq ($(CONFIG_DRKAISER), yes)
 FEATURE_FLAGS += -D'CONFIG_DRKAISER=1'
-PROGRAMMER_OBJS += drkaiser.o
+PROGRAMMER_OBJS += drkaiser.o pcidev.o
 endif

ifeq ($(CONFIG_NICREALTEK), yes)
 FEATURE_FLAGS += -D'CONFIG_NICREALTEK=1'
-PROGRAMMER_OBJS += nicrealtek.o
+PROGRAMMER_OBJS += nicrealtek.o pcidev.o
 endif

ifeq ($(CONFIG_NICNATSEMI), yes)
 FEATURE_FLAGS += -D'CONFIG_NICNATSEMI=1'
-PROGRAMMER_OBJS += nicnatsemi.o
+PROGRAMMER_OBJS += nicnatsemi.o pcidev.o
 endif

ifeq ($(CONFIG_NICINTEL), yes)
 FEATURE_FLAGS += -D'CONFIG_NICINTEL=1'
-PROGRAMMER_OBJS += nicintel.o
+PROGRAMMER_OBJS += nicintel.o pcidev.o
 endif

ifeq ($(CONFIG_NICINTEL_SPI), yes)
 FEATURE_FLAGS += -D'CONFIG_NICINTEL_SPI=1'
-PROGRAMMER_OBJS += nicintel_spi.o
+PROGRAMMER_OBJS += nicintel_spi.o pcidev.o
 endif

ifeq ($(CONFIG_NICINTEL_EEPROM), yes)
 FEATURE_FLAGS += -D'CONFIG_NICINTEL_EEPROM=1'
-PROGRAMMER_OBJS += nicintel_eeprom.o
+PROGRAMMER_OBJS += nicintel_eeprom.o pcidev.o
 endif

ifeq ($(CONFIG_OGP_SPI), yes)
 FEATURE_FLAGS += -D'CONFIG_OGP_SPI=1'
-PROGRAMMER_OBJS += ogp_spi.o
+PROGRAMMER_OBJS += ogp_spi.o pcidev.o
 endif

ifeq ($(CONFIG_BUSPIRATE_SPI), yes)
@@ -745,7 +746,7 @@

ifeq ($(CONFIG_SATAMV), yes)
 FEATURE_FLAGS += -D'CONFIG_SATAMV=1'
-PROGRAMMER_OBJS += satamv.o
+PROGRAMMER_OBJS += satamv.o pcidev.o
 endif

ifeq ($(CONFIG_LINUX_MTD), yes)
@@ -835,7 +836,6 @@

USE_LIBPCI := $(if $(call filter_deps,$(DEPENDS_ON_LIBPCI)),yes,no)
 ifeq ($(USE_LIBPCI), yes)
-PROGRAMMER_OBJS += pcidev.o
 override CFLAGS  += $(CONFIG_LIBPCI_CFLAGS)
 override LDFLAGS += $(CONFIG_LIBPCI_LDFLAGS)
 endif