diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-05-16 06:48:43 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-18 12:42:47 -0700 |
commit | 5d57509a889d29e79f951f5e85ba6e97cd89883f (patch) | |
tree | ab480f9ad43070fa6638745cd9c97810105b3c9a /meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch | |
parent | 760100eda043bf76ae710b50b398430c8755a139 (diff) | |
download | meta-openembedded-contrib-5d57509a889d29e79f951f5e85ba6e97cd89883f.tar.gz |
openocd: Upgrade to latest git version
Drop upstream'ed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch')
-rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch deleted file mode 100644 index c5b9083dca..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b95a996bfb281104b68ec66f32ebb79db519a4a8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 May 2018 21:06:46 -0700 -Subject: [PATCH] Fix libusb-1.0.22 deprecated libusb_set_debug with - libusb_set_option - -libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace -with equivalent libusb_set_option() API - -see libusb commit for more details - -https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/4540/] - src/jtag/drivers/xds110.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c -index 90b699027..9bfe02ea8 100644 ---- a/src/jtag/drivers/xds110.c -+++ b/src/jtag/drivers/xds110.c -@@ -367,8 +367,11 @@ static bool usb_connect(void) - - /* Set libusb to auto detach kernel and disable debug messages */ - (void)libusb_set_auto_detach_kernel_driver(dev, 1); -+#if LIBUSB_API_VERSION >= 0x01000106 -+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE); -+#else - libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE); -- -+#endif - /* Claim the debug interface on the XDS110 */ - result = libusb_claim_interface(dev, INTERFACE_DEBUG); - } else { --- -2.17.1 - |