diff mbox series

package/openocd: require wchar for the xds110 driver

Message ID acbeaaffd34a068b66bde44fd96046faf2096c04.1625151247.git.baruch@tkos.co.il
State Accepted
Headers show
Series package/openocd: require wchar for the xds110 driver | expand

Commit Message

Baruch Siach July 1, 2021, 2:54 p.m. UTC
The xds110 driver requires wchar, and is enabled by default. Make sure
to disable xds110 when wchar support is missing.

Fixes:
http://autobuild.buildroot.net/results/530bfe22ff509cf4ebfdf99a183312a1053f505f/
http://autobuild.buildroot.net/results/956538a0a6029137db19cce30dc340e2e30dd166/
http://autobuild.buildroot.net/results/ae7da2ce1389ece44a4ca65108fee02e318df7b3/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/openocd/Config.in  | 9 +++++++++
 package/openocd/openocd.mk | 1 +
 2 files changed, 10 insertions(+)

Comments

Thomas Petazzoni July 3, 2021, 9:35 p.m. UTC | #1
On Thu,  1 Jul 2021 17:54:07 +0300
Baruch Siach <baruch@tkos.co.il> wrote:

> The xds110 driver requires wchar, and is enabled by default. Make sure
> to disable xds110 when wchar support is missing.
> 
> Fixes:
> http://autobuild.buildroot.net/results/530bfe22ff509cf4ebfdf99a183312a1053f505f/
> http://autobuild.buildroot.net/results/956538a0a6029137db19cce30dc340e2e30dd166/
> http://autobuild.buildroot.net/results/ae7da2ce1389ece44a4ca65108fee02e318df7b3/
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/openocd/Config.in  | 9 +++++++++
>  package/openocd/openocd.mk | 1 +
>  2 files changed, 10 insertions(+)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/openocd/Config.in b/package/openocd/Config.in
index f2e79f29fe10..ac4feb9a6e4b 100644
--- a/package/openocd/Config.in
+++ b/package/openocd/Config.in
@@ -144,6 +144,15 @@  config BR2_PACKAGE_OPENOCD_ARMEW
 	  Enable building support for the Olimex ARM-JTAG-EW
 	  Programmer (default is auto)
 
+config BR2_PACKAGE_OPENOCD_XDS110
+	bool "TI XDS110 Debug Probe"
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
+	select BR2_PACKAGE_LIBUSB
+	help
+	  Enable building support for the TI XDS110 Debug Probe.
+
 config BR2_PACKAGE_OPENOCD_PARPORT
 	bool "pc parallel port driver"
 	help
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index b74426ff4701..9f53ae3ee390 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -49,6 +49,7 @@  OPENOCD_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_OPENOCD_VSLLINK),--enable-vsllink,--disable-vsllink) \
 	$(if $(BR2_PACKAGE_OPENOCD_USBPROG),--enable-usbprog,--disable-usbprog) \
 	$(if $(BR2_PACKAGE_OPENOCD_RLINK),--enable-rlink,--disable-rlink) \
+	$(if $(BR2_PACKAGE_OPENOCD_XDS110),--enable-xds110,--disable-xds110) \
 	$(if $(BR2_PACKAGE_OPENOCD_ARMEW),--enable-armjtagew,--disable-armjtagew) \
 	$(if $(BR2_PACKAGE_OPENOCD_CMSIS_DAP),--enable-cmsis-dap,--disable-cmsis-dap) \
 	$(if $(BR2_PACKAGE_OPENOCD_PARPORT),--enable-parport,--disable-parport) \