package/flashrom: libusb-compat 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 0a5a7248e158dfa45232bff9ac37aba19d3bd910..1edf162d31c186164043da260d8c00ed84625b22 100644 (file)
--- a/package/flashrom/Config.in
+++ b/package/flashrom/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_FLASHROM
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
        select BR2_PACKAGE_LIBUSB
-       select BR2_PACKAGE_LIBUSB_COMPAT
        help
          flashrom is a utility for identifying, reading, writing,
          verifying and erasing flash chips. It is designed to flash

diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 40198bac60894046dd5a641509309da25eed3c5f..69a0cbfe5c3b5374c33db04a7d4198519161c371 100644 (file)
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -7,7 +7,7 @@
 FLASHROM_VERSION = 1.0
 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
 FLASHROM_SITE = https://download.flashrom.org/releases
-FLASHROM_DEPENDENCIES = libusb libusb-compat host-pkgconf
+FLASHROM_DEPENDENCIES = libusb host-pkgconf
 FLASHROM_LICENSE = GPL-2.0+
 FLASHROM_LICENSE_FILES = COPYING
 
@@ -22,6 +22,13 @@ FLASHROM_MAKE_OPTS += \
        CONFIG_USBBLASTER_SPI=no
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+FLASHROM_DEPENDENCIES += host-pkgconf libusb-compat
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=yes
+else
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no
+endif
+
 ifeq ($(BR2_PACKAGE_PCIUTILS),y)
 FLASHROM_DEPENDENCIES += pciutils
 FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes