gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package/openocd: depends on libftdi1 instead of libftdi

Browse Source 
Note that, if both libftdi and libftdi1 are available, openocd will
prefer libftdi1, so does Buildroot. ;-)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Samuel Martin 2015-03-17 18:36:36 +01:00 committed by Thomas Petazzoni
parent 772dbcd797
commit 9bdf592654
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/openocd/Config.in
View File

@ -121,7 +121,7 @@ config BR2_PACKAGE_OPENOCD_PARPORT
config BR2_PACKAGE_OPENOCD_FT2XXX
bool "FT2232 based devices (DEPRECATED)"
select BR2_PACKAGE_LIBFTDI
select BR2_PACKAGE_LIBFTDI1
depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
depends on BR2_ARCH_HAS_ATOMICS
help
@ -135,7 +135,7 @@ config BR2_PACKAGE_OPENOCD_VPI
config BR2_PACKAGE_OPENOCD_UBLASTER
bool "Altera USB-Blaster"
select BR2_PACKAGE_LIBFTDI
select BR2_PACKAGE_LIBFTDI1
depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
depends on BR2_ARCH_HAS_ATOMICS
help
@ -176,7 +176,7 @@ config BR2_PACKAGE_OPENOCD_GW16012
config BR2_PACKAGE_OPENOCD_PRESTO
bool "ASIX Presto Programmer"
select BR2_PACKAGE_LIBFTDI
select BR2_PACKAGE_LIBFTDI1
depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
depends on BR2_ARCH_HAS_ATOMICS
help
@ -185,7 +185,7 @@ config BR2_PACKAGE_OPENOCD_PRESTO
config BR2_PACKAGE_OPENOCD_OPENJTAG
bool "OpenJTAG Programmer"
select BR2_PACKAGE_LIBFTDI
select BR2_PACKAGE_LIBFTDI1
depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
depends on BR2_ARCH_HAS_ATOMICS
help

2
package/openocd/openocd.mk
View File

@ -23,7 +23,7 @@ OPENOCD_CONF_OPTS = \
# the dependencies they need.
OPENOCD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBFTDI),libftdi) \
$(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \
$(if $(BR2_PACKAGE_LIBUSB),libusb) \
$(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \
$(if $(BR2_PACKAGE_LIBHID),libhid)