Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fixed wrong script dir location for flash targets #157

Closed
wants to merge 3 commits into from
Closed

Fixed wrong script dir location for flash targets #157

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e321d14
Fixed wrong script dir location for flash targets
JelmerT Jul 25, 2017
704ed01
Added / in example script dir path, just for consistency
JelmerT Jul 27, 2017
7ea2396
Removed references to missing stlink GDB scripts
JelmerT Jul 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions examples/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -230,7 +231,6 @@ styleclean: $(STYLECHECKFILES:=.styleclean)
@printf " FLASH $<\n"
$(STFLASH) write $(*).bin 0x8000000

ifeq ($(STLINK_PORT),)
ifeq ($(BMP_PORT),)
ifeq ($(OOCD_FILE),)
%.flash: %.elf
Expand All @@ -253,15 +253,7 @@ else
@printf " GDB $(*).elf (flash)\n"
$(GDB) --batch \
-ex 'target extended-remote $(BMP_PORT)' \
-x $(SCRIPT_DIR)/black_magic_probe_flash.scr \
$(*).elf
endif
else
%.flash: %.elf
@printf " GDB $(*).elf (flash)\n"
$(GDB) --batch \
-ex 'target extended-remote $(STLINK_PORT)' \
-x $(SCRIPT_DIR)/stlink_flash.scr \
-x $(EXAMPLES_SCRIPT_DIR)/black_magic_probe_flash.scr \
$(*).elf
endif

Expand Down