diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2015-03-17 18:36:36 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-03-20 23:30:08 +0100 |
| commit | 9bdf592654164ec7331c4e377b079302ed6da0e9 (patch) | |
| tree | 7ee39de301800ab1a7bf0f4a050153c7ccfa1df8 /package/openocd | |
| parent | 772dbcd797879f56919d0cd026c2aa882af21f71 (diff) | |
| download | buildroot-9bdf592654164ec7331c4e377b079302ed6da0e9.tar.gz buildroot-9bdf592654164ec7331c4e377b079302ed6da0e9.zip | |
package/openocd: depends on libftdi1 instead of libftdi
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>
Diffstat (limited to 'package/openocd')
| -rw-r--r-- | package/openocd/Config.in | 8 | ||||
| -rw-r--r-- | package/openocd/openocd.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/openocd/Config.in b/package/openocd/Config.in index 7c140c7d04..2db17fa76a 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -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 diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index fd7e09fad6..3b7685061b 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -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) |
