Store the masked chip_id in the stlink structure. Should fix unexpected

[fw/stlink] / flash / Makefile

diff --git a/flash/Makefile b/flash/Makefile
index 6b708714fb534204a7e160bcec0f09041af4c937..cb7dcd2c27491ed9ac0daa5c4891acae3f23b160 100644 (file)
--- a/flash/Makefile
+++ b/flash/Makefile
@@ -1,12 +1,4 @@
-# make ... for both libusb and libsg
-#
-# make CONFIG_USE_LIBSG=0 ...
-# for just libusb
-#
-CC=gcc
-
 CFLAGS+=-g
-CFLAGS+=-DCONFIG_USE_LIBUSB=1
 CFLAGS+=-DDEBUG
 CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
@@ -14,15 +6,6 @@ CFLAGS+=-I../src
 
 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)
 
@@ -30,7 +13,7 @@ NAME=flash
 
 all: $(NAME)
 
-$(NAME): $(OBJS)
+$(NAME): $(OBJS) ../libstlink.a
        $(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LDFLAGS)
 
 %.o: %.c