Nico Huber submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
NEED_PCI: remove macro

The NEED_PCI macro is only used to guard prototypes. This is not needed.

Change-Id: I6895b795bc96b3e251700bff4b0054407aac789a
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/62834
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M Makefile
M meson.build
M programmer.h
3 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index bfa9c67..367d8ee 100644
--- a/Makefile
+++ b/Makefile
@@ -838,7 +838,6 @@
USE_LIBPCI := $(if $(call filter_deps,$(DEPENDS_ON_LIBPCI)),yes,no)
ifeq ($(USE_LIBPCI), yes)
PROGRAMMER_OBJS += pcidev.o
-FEATURE_FLAGS += -D'NEED_PCI=1'
override CFLAGS += $(CONFIG_LIBPCI_CFLAGS)
override LDFLAGS += $(CONFIG_LIBPCI_LDFLAGS)
endif
diff --git a/meson.build b/meson.build
index 5a6bc2a..f8ca1d3 100644
--- a/meson.build
+++ b/meson.build
@@ -159,7 +159,6 @@
if get_option('pciutils')
srcs += 'pcidev.c'
deps += dependency('libpci')
- cargs += '-DNEED_PCI=1'
elif need_libpci
error('pciutils is disabled but one or more enabled programmer requires PCI access')
endif
diff --git a/programmer.h b/programmer.h
index 47d2dc3..86e45f7 100644
--- a/programmer.h
+++ b/programmer.h
@@ -115,7 +115,6 @@
unsigned int half_period;
};

-#if NEED_PCI == 1
struct pci_dev;
struct pci_filter;

@@ -141,7 +140,6 @@
int rpci_write_byte(struct pci_dev *dev, int reg, uint8_t data);
int rpci_write_word(struct pci_dev *dev, int reg, uint16_t data);
int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data);
-#endif

#if CONFIG_INTERNAL == 1
struct penable {

5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.

To view, visit change 62834. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I6895b795bc96b3e251700bff4b0054407aac789a
Gerrit-Change-Number: 62834
Gerrit-PatchSet: 7
Gerrit-Owner: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-MessageType: merged