[Buildroot] [git commit] package/flashrom: libusb is optional, not mandatory
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Tue Mar 5 20:45:44 UTC 2019
commit: https://git.buildroot.net/buildroot/commit/?id=276ddad9f4efe275af3887cd30ac1432f7e96a68
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/flashrom/Config.in | 6 ------
package/flashrom/flashrom.mk | 8 +++++++-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in
index 1edf162d31..f787bb3b62 100644
--- a/package/flashrom/Config.in
+++ b/package/flashrom/Config.in
@@ -1,8 +1,6 @@
config BR2_PACKAGE_FLASHROM
bool "flashrom"
depends on BR2_i386 || BR2_x86_64
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
- select BR2_PACKAGE_LIBUSB
help
flashrom is a utility for identifying, reading, writing,
verifying and erasing flash chips. It is designed to flash
@@ -11,7 +9,3 @@ config BR2_PACKAGE_FLASHROM
programmer devices.
http://flashrom.org/
-
-comment "flashrom needs a toolchain w/ threads"
- depends on BR2_i386 || BR2_x86_64
- depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 69a0cbfe5c..733ad7318d 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -7,7 +7,6 @@
FLASHROM_VERSION = 1.0
FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
FLASHROM_SITE = https://download.flashrom.org/releases
-FLASHROM_DEPENDENCIES = libusb host-pkgconf
FLASHROM_LICENSE = GPL-2.0+
FLASHROM_LICENSE_FILES = COPYING
@@ -22,6 +21,13 @@ FLASHROM_MAKE_OPTS += \
CONFIG_USBBLASTER_SPI=no
endif
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+FLASHROM_DEPENDENCIES += host-pkgconf libusb
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=yes
+else
+FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no
+endif
+
ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
FLASHROM_DEPENDENCIES += host-pkgconf libusb-compat
FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=yes
More information about the buildroot
mailing list