Merge branch 'master' of github.com:karlp/stlink

diff --cc flash/Makefile
index 9fa67435c4b163afed58e5e11c2a0dce4d9bb86d,6e1675422f063dab041a582cd964378ad069083e..dc16b62a927ae63be25e383e71e5676f758b8831
--- 1/flash/Makefile
--- 2/flash/Makefile
+++ b/flash/Makefile
@@@ -12,17 -5,8 +5,8 @@@ CFLAGS+=-std=gnu9
  CFLAGS+=-Wall -Wextra
  CFLAGS+=-I../src
  
 -LDFLAGS=-lusb-1.0 -L.. -lstlink 
 +LDFLAGS=-L.. -lstlink -lusb-1.0
  
- ifeq ($(CONFIG_USE_LIBSG),)
- CONFIG_USE_LIBSG=1
- endif
- 
- ifneq ($(CONFIG_USE_LIBSG),0)
- CFLAGS+=-DCONFIG_USE_LIBSG=1
- LDFLAGS+=-lsgutils2
- endif
- 
  SRCS=main.c
  OBJS=$(SRCS:.c=.o)
  

diff --cc gdbserver/Makefile
index a10a0d82793ff6cbae3b6104a3473a123d79a7fb,e73103dfbb58c67fb0ea4f696e32c92fd9d5c00a..c0b927e2094889189bd5b9a7518c4718ec93524c
--- 1/gdbserver/Makefile
--- 2/gdbserver/Makefile
+++ b/gdbserver/Makefile
@@@ -9,17 -3,8 +3,8 @@@ OBJS = gdb-remote.o gdb-server.
  
  CFLAGS+=-g -Wall -Werror -std=gnu99 -I../src
  CFLAGS+=-DCONFIG_USE_LIBUSB=1
 -LDFLAGS=-lusb-1.0 -L.. -lstlink 
 +LDFLAGS=-L.. -lstlink -lusb-1.0
  
- ifeq ($(CONFIG_USE_LIBSG),)
- CONFIG_USE_LIBSG=1
- endif
- 
- ifneq ($(CONFIG_USE_LIBSG),0)
- CFLAGS+=-DCONFIG_USE_LIBSG=1
- LDFLAGS+=-lsgutils2
- endif
- 
  all: $(PRG)
  
  $(PRG): $(OBJS)