diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-02-28 20:26:11 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-03-19 20:10:05 +0100 |
| commit | e2fb57f537c788f9c608599fc9867c605bb372e0 (patch) | |
| tree | b4ca3a455fdd707d597336689df43cfb70f42a84 | |
| parent | a60ccf0f2b8c93fde8aba43cdb9dc7a376fe26eb (diff) | |
| download | buildroot-e2fb57f537c788f9c608599fc9867c605bb372e0.tar.gz buildroot-e2fb57f537c788f9c608599fc9867c605bb372e0.zip | |
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>
(cherry picked from commit b36054fc7ca55b73fa09d68b239b45d0e30364e9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/flashrom/Config.in | 1 | ||||
| -rw-r--r-- | package/flashrom/flashrom.mk | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index 0a5a7248e1..1edf162d31 100644 --- 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 40198bac60..69a0cbfe5c 100644 --- 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 |
