rules: flash target helpers had broken script paths

This commit is contained in:
Jelmer Tiete
2017-07-24 23:52:10 -04:00
committed by Karl Palsson
parent fc60651b6a
commit 1f322c1cef

View File

@@ -92,7 +92,8 @@ endif
include $(OPENCM3_DIR)/mk/genlink-config.mk
endif
SCRIPT_DIR = $(OPENCM3_DIR)/scripts
OPENCM3_SCRIPT_DIR = $(OPENCM3_DIR)/scripts
EXAMPLES_SCRIPT_DIR = $(OPENCM3_DIR)/../scripts
###############################################################################
# C flags
@@ -215,7 +216,7 @@ styleclean: $(STYLECHECKFILES:=.styleclean)
# the cat is due to multithreaded nature - we like to have consistent chunks of text on the output
%.stylecheck: %
$(Q)$(SCRIPT_DIR)$(STYLECHECK) $(STYLECHECKFLAGS) $* > $*.stylecheck; \
$(Q)$(OPENCM3_SCRIPT_DIR)$(STYLECHECK) $(STYLECHECKFLAGS) $* > $*.stylecheck; \
if [ -s $*.stylecheck ]; then \
cat $*.stylecheck; \
else \
@@ -253,7 +254,7 @@ else
@printf " GDB $(*).elf (flash)\n"
$(GDB) --batch \
-ex 'target extended-remote $(BMP_PORT)' \
-x $(SCRIPT_DIR)/black_magic_probe_flash.scr \
-x $(EXAMPLES_SCRIPT_DIR)/black_magic_probe_flash.scr \
$(*).elf
endif
else
@@ -261,7 +262,7 @@ else
@printf " GDB $(*).elf (flash)\n"
$(GDB) --batch \
-ex 'target extended-remote $(STLINK_PORT)' \
-x $(SCRIPT_DIR)/stlink_flash.scr \
-x $(EXAMPLES_SCRIPT_DIR)/stlink_flash.scr \
$(*).elf
endif