From 4fe875c92f73a20c99f270838a8aee2c768bfdcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 10 Oct 2019 11:53:54 +0200 Subject: [PATCH] Makefile.include/term: define 'flash/flash-only' as TERMFLASHDEPS This puts the handling of `flash/flash-only` in common for both `term/cleanterm` commands. --- Makefile.include | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.include b/Makefile.include index 2c20082144..a12d242b33 100644 --- a/Makefile.include +++ b/Makefile.include @@ -637,16 +637,17 @@ flash-only: $(FLASHDEPS) preflash: $(BUILD_BEFORE_FLASH) $(PREFLASHER) $(PREFFLAGS) +TERMFLASHDEPS ?= $(filter flash flash-only,$(MAKECMDGOALS)) termdeps: $(TERMDEPS) -term: $(filter flash flash-only, $(MAKECMDGOALS)) $(TERMDEPS) +term: $(TERMFLASHDEPS) $(TERMDEPS) $(call check_cmd,$(TERMPROG),Terminal program) $(TERMPROG) $(TERMFLAGS) # Term without the pyterm added logging # TERMFLAGS must be exported for `jlink.sh term_rtt`. cleanterm: export PYTERMFLAGS += --noprefix --no-repeat-command-on-empty-line -cleanterm: $(filter flash flash-only, $(MAKECMDGOALS)) $(TERMDEPS) +cleanterm: $(TERMFLASHDEPS) $(TERMDEPS) $(call check_cmd,$(TERMPROG),Terminal program) $(TERMPROG) $(TERMFLAGS)