From 42d658419f19b613921fc453277153d92918f469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Tue, 27 Aug 2019 12:06:10 +0200 Subject: [PATCH 1/3] boards/common/msba2: remove duplicate PORT PORT is already given in pyterm TERMFLAGS. --- boards/common/msba2/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/common/msba2/Makefile.include b/boards/common/msba2/Makefile.include index 8b5342698e..09fd59eb6b 100644 --- a/boards/common/msba2/Makefile.include +++ b/boards/common/msba2/Makefile.include @@ -16,7 +16,7 @@ PORT_LINUX ?= /dev/ttyUSB0 # This does not make a lot of sense, but it has the same value as the previous code PORT_DARWIN ?= /dev/tty.usbserial-ARM -TERMFLAGS += -tg -p "$(PORT)" +TERMFLAGS += -tg include $(RIOTMAKE)/tools/serial.inc.mk export CFLAGS_CPU = -mcpu=arm7tdmi-s From 62fe786cd8045d305e5780990354266fb4073cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Tue, 27 Aug 2019 12:07:00 +0200 Subject: [PATCH 2/3] makefiles/serial.inc.mk: add PYTERMFLAGS variable Add a variable for `pyterm` specific flags that are not handled by other terminals. This will prevent issues with boards that have options only supported by `pyterm` and setting `pyterm` options from the environment. --- makefiles/tools/serial.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/tools/serial.inc.mk b/makefiles/tools/serial.inc.mk index 8abcf7fe1d..d18eb6fd90 100644 --- a/makefiles/tools/serial.inc.mk +++ b/makefiles/tools/serial.inc.mk @@ -15,7 +15,7 @@ export BAUD ?= 115200 RIOT_TERMINAL ?= pyterm ifeq ($(RIOT_TERMINAL),pyterm) TERMPROG ?= $(RIOTTOOLS)/pyterm/pyterm - TERMFLAGS ?= -p "$(PORT)" -b "$(BAUD)" + TERMFLAGS ?= -p "$(PORT)" -b "$(BAUD)" $(PYTERMFLAGS) else ifeq ($(RIOT_TERMINAL),socat) SOCAT_OUTPUT ?= - TERMPROG ?= $(RIOT_TERMINAL) From 367aa841a2782e6cf8756a5548a88cf002a6d0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Tue, 27 Aug 2019 12:12:16 +0200 Subject: [PATCH 3/3] boards/pyterm: change TERMFLAGS to PYTERMFLAGS The boards are using `pyterm` specific options that do not work on any other `RIOT_TERMINAL`. It is a shame this is required but at least do not pass arbitrary arguments to the other RIOT_TERMINAL. So use the new PYTERMFLAGS for this. --- boards/common/msba2/Makefile.include | 2 +- boards/lobaro-lorabox/Makefile.include | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/common/msba2/Makefile.include b/boards/common/msba2/Makefile.include index 09fd59eb6b..e4cb2af037 100644 --- a/boards/common/msba2/Makefile.include +++ b/boards/common/msba2/Makefile.include @@ -16,7 +16,7 @@ PORT_LINUX ?= /dev/ttyUSB0 # This does not make a lot of sense, but it has the same value as the previous code PORT_DARWIN ?= /dev/tty.usbserial-ARM -TERMFLAGS += -tg +PYTERMFLAGS += -tg include $(RIOTMAKE)/tools/serial.inc.mk export CFLAGS_CPU = -mcpu=arm7tdmi-s diff --git a/boards/lobaro-lorabox/Makefile.include b/boards/lobaro-lorabox/Makefile.include index 136cf3034f..905d3d9e39 100644 --- a/boards/lobaro-lorabox/Makefile.include +++ b/boards/lobaro-lorabox/Makefile.include @@ -17,4 +17,4 @@ FLASHFILE ?= $(BINFILE) # -l 0x1ff: amount of sectors to erase FFLAGS += -p $(PORT) -e -u -S -l 0x1ff -w $(FLASHFILE) -TERMFLAGS += --set-rts 0 +PYTERMFLAGS += --set-rts 0