diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-02-28 20:26:09 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-03-19 20:09:28 +0100 |
| commit | b18be52d41c90d66000d763a3ce496242d22294a (patch) | |
| tree | 352c4714b919a1fbf423e333dd5b10107975e0eb | |
| parent | 838e5efae235802c83fc389ca08748ba70d7b418 (diff) | |
| download | buildroot-b18be52d41c90d66000d763a3ce496242d22294a.tar.gz buildroot-b18be52d41c90d66000d763a3ce496242d22294a.zip | |
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>
(cherry picked from commit f317411f3391451f0815c8d4f2f95ed1b14770a6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/flashrom/Config.in | 1 | ||||
| -rw-r--r-- | package/flashrom/flashrom.mk | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index 8f26a634e6..66fe359724 100644 --- 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 70f47b5a04..73d56f7f80 100644 --- 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 |
