* [Buildroot] [PATCH/next 2/6] package/flashrom: pciutils is optional, not mandatory
2019-02-28 19:26 [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Fabrice Fontaine
@ 2019-02-28 19:26 ` Fabrice Fontaine
2019-02-28 19:26 ` [Buildroot] [PATCH/next 3/6] package/flashrom: libftdi " Fabrice Fontaine
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2019-02-28 19:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/flashrom/Config.in | 1 -
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
--
2.14.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH/next 3/6] package/flashrom: libftdi is optional, not mandatory
2019-02-28 19:26 [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Fabrice Fontaine
2019-02-28 19:26 ` [Buildroot] [PATCH/next 2/6] package/flashrom: pciutils is optional, not mandatory Fabrice Fontaine
@ 2019-02-28 19:26 ` Fabrice Fontaine
2019-02-28 19:26 ` [Buildroot] [PATCH/next 4/6] package/flashrom: libusb-compat " Fabrice Fontaine
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2019-02-28 19:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/flashrom/Config.in | 1 -
package/flashrom/flashrom.mk | 13 ++++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in
index 66fe359724..0a5a7248e1 100644
--- a/package/flashrom/Config.in
+++ b/package/flashrom/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_FLASHROM
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
- select BR2_PACKAGE_LIBFTDI
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 73d56f7f80..40198bac60 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -7,10 +7,21 @@
FLASHROM_VERSION = 1.0
FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
FLASHROM_SITE = https://download.flashrom.org/releases
-FLASHROM_DEPENDENCIES = libusb libusb-compat libftdi host-pkgconf
+FLASHROM_DEPENDENCIES = libusb libusb-compat host-pkgconf
FLASHROM_LICENSE = GPL-2.0+
FLASHROM_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_LIBFTDI),y)
+FLASHROM_DEPENDENCIES += host-pkgconf libftdi
+FLASHROM_MAKE_OPTS += \
+ CONFIG_FT2232_SPI=yes \
+ CONFIG_USBBLASTER_SPI=yes
+else
+FLASHROM_MAKE_OPTS += \
+ CONFIG_FT2232_SPI=no \
+ CONFIG_USBBLASTER_SPI=no
+endif
+
ifeq ($(BR2_PACKAGE_PCIUTILS),y)
FLASHROM_DEPENDENCIES += pciutils
FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes
--
2.14.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH/next 4/6] package/flashrom: libusb-compat is optional, not mandatory
2019-02-28 19:26 [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Fabrice Fontaine
2019-02-28 19:26 ` [Buildroot] [PATCH/next 2/6] package/flashrom: pciutils is optional, not mandatory Fabrice Fontaine
2019-02-28 19:26 ` [Buildroot] [PATCH/next 3/6] package/flashrom: libftdi " Fabrice Fontaine
@ 2019-02-28 19:26 ` Fabrice Fontaine
2019-02-28 19:26 ` [Buildroot] [PATCH/next 5/6] package/flashrom: libusb " Fabrice Fontaine
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2019-02-28 19:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/flashrom/Config.in | 1 -
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
--
2.14.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH/next 5/6] package/flashrom: libusb is optional, not mandatory
2019-02-28 19:26 [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Fabrice Fontaine
` (2 preceding siblings ...)
2019-02-28 19:26 ` [Buildroot] [PATCH/next 4/6] package/flashrom: libusb-compat " Fabrice Fontaine
@ 2019-02-28 19:26 ` Fabrice Fontaine
2019-02-28 19:26 ` [Buildroot] [PATCH/next 6/6] package/flashrom: remove x86 dependency Fabrice Fontaine
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2019-02-28 19:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.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
--
2.14.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH/next 6/6] package/flashrom: remove x86 dependency
2019-02-28 19:26 [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Fabrice Fontaine
` (3 preceding siblings ...)
2019-02-28 19:26 ` [Buildroot] [PATCH/next 5/6] package/flashrom: libusb " Fabrice Fontaine
@ 2019-02-28 19:26 ` Fabrice Fontaine
2019-03-05 20:49 ` [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Thomas Petazzoni
2019-03-19 19:15 ` Peter Korsgaard
6 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2019-02-28 19:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/flashrom/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in
index f787bb3b62..948c774133 100644
--- a/package/flashrom/Config.in
+++ b/package/flashrom/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_FLASHROM
bool "flashrom"
- depends on BR2_i386 || BR2_x86_64
help
flashrom is a utility for identifying, reading, writing,
verifying and erasing flash chips. It is designed to flash
--
2.14.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency
2019-02-28 19:26 [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Fabrice Fontaine
` (4 preceding siblings ...)
2019-02-28 19:26 ` [Buildroot] [PATCH/next 6/6] package/flashrom: remove x86 dependency Fabrice Fontaine
@ 2019-03-05 20:49 ` Thomas Petazzoni
2019-03-19 19:15 ` Peter Korsgaard
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2019-03-05 20:49 UTC (permalink / raw)
To: buildroot
On Thu, 28 Feb 2019 20:26:08 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> flashrom uses its own internal DMI decoder since version 0.9.8 and
> https://github.com/flashrom/flashrom/commit/4c6d3a4b732732eb20bfb0fc9d857abaa4c41c88
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/flashrom/Config.in | 2 --
> 1 file changed, 2 deletions(-)
Entire series applied to master. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency
2019-02-28 19:26 [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Fabrice Fontaine
` (5 preceding siblings ...)
2019-03-05 20:49 ` [Buildroot] [PATCH/next 1/6] package/flashrom: remove dmidecode dependency Thomas Petazzoni
@ 2019-03-19 19:15 ` Peter Korsgaard
6 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2019-03-19 19:15 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> flashrom uses its own internal DMI decoder since version 0.9.8 and
> https://github.com/flashrom/flashrom/commit/4c6d3a4b732732eb20bfb0fc9d857abaa4c41c88
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
These are all arguably bugfixes, so I've committed them to 2019.02.x -
Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread