package/flashrom: pciutils is optional, not mandatory

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in
index 8f26a634e62be851731816c8a1a2353af14110a0..66fe35972467770269e56b05fea3c938db25a70b 100644 (file)
--- a/package/flashrom/Config.in
+++ b/package/flashrom/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_FLASHROM
        bool "flashrom"
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-       select BR2_PACKAGE_PCIUTILS
        select BR2_PACKAGE_LIBUSB
        select BR2_PACKAGE_LIBUSB_COMPAT
        select BR2_PACKAGE_LIBFTDI

diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 70f47b5a041dc04877731471b73e3065b2484ee1..73d56f7f80246330ed1c3846776ed6e322194fd4 100644 (file)
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -7,13 +7,21 @@
 FLASHROM_VERSION = 1.0
 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
 FLASHROM_SITE = https://download.flashrom.org/releases
-FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf
+FLASHROM_DEPENDENCIES = libusb libusb-compat libftdi host-pkgconf
 FLASHROM_LICENSE = GPL-2.0+
 FLASHROM_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_PCIUTILS),y)
+FLASHROM_DEPENDENCIES += pciutils
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes
+else
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no
+endif
+
 define FLASHROM_BUILD_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" -C $(@D)
+               CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" \
+               $(FLASHROM_MAKE_OPTS) -C $(@D)
 endef
 
 define FLASHROM_INSTALL_TARGET_CMDS