Commit 9bdf5926 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

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: default avatarSamuel Martin <s.martin49@gmail.com>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 772dbcd7

package/openocd/Config.in

+4 −4
Original line number Diff line number Diff line
@@ -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

package/openocd/openocd.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)