kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

Merge pull request #12724 from aabadie/pr/stdio_rtt_blacklist

Browse Source 
make: improve handling of the stdio_rtt module, improve dependency management at application level
This commit is contained in:
Hauke Petersen 2020-01-15 10:12:13 +01:00 committed by GitHub
commit 8b408fc828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.dep
View File

@ -468,6 +468,9 @@ endif
ifneq (,$(filter stdio_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart
# stdio_rtt cannot be used when stdio_uart is loaded
DISABLE_MODULE += stdio_rtt
endif
ifneq (,$(filter isrpipe,$(USEMODULE)))

3
boards/hamilton/Makefile.dep
View File

@ -12,3 +12,6 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
# ToDo: peripherals to be added in the future
#USEMODULE += apds9007
endif
# Use Segger's RTT by default for stdio on this board
DEFAULT_MODULE += stdio_rtt

8
boards/hamilton/Makefile.include
View File

@ -3,10 +3,8 @@ export JLINK_DEVICE := atsamr21e18a
OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
OFLAGS := --gap-fill 0xff
# Configure terminal, hamilton doesn't provide any UART, thus use RTT
TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh
TERMFLAGS = term-rtt
USEMODULE += stdio_rtt
# use JLink Segger RTT by default
RIOT_TERMINAL ?= jlink
include $(RIOTMAKE)/tools/serial.inc.mk
include $(RIOTMAKE)/tools/jlink.inc.mk

3
boards/ruuvitag/Makefile.dep
View File

@ -4,4 +4,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += lis2dh12_spi
endif
# Use Segger's RTT by default for stdio on this board
DEFAULT_MODULE += stdio_rtt
include $(RIOTBOARD)/common/nrf52/Makefile.dep

12
boards/ruuvitag/Makefile.include
View File

@ -1,7 +1,11 @@
# for this board, we are using Segger's RTT as default terminal interface
USEMODULE += stdio_rtt
TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh
TERMFLAGS = term-rtt
# HACK: replicate dependency resolution in Makefile.dep, only works
# if `USEMODULE` or `DEFAULT_MODULE` is set by the command line or in the
# application Makefile.
ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE)))
RIOT_TERMINAL ?= jlink
endif
include $(RIOTMAKE)/tools/serial.inc.mk
# use shared Makefile.include
include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include

3
boards/thingy52/Makefile.dep
View File

@ -4,4 +4,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += lps22hb
endif
# Use Segger's RTT by default for stdio on this board
DEFAULT_MODULE += stdio_rtt
include $(RIOTBOARD)/common/nrf52/Makefile.dep

12
boards/thingy52/Makefile.include
View File

@ -1,7 +1,11 @@
# for this board, we are using Segger's RTT as default terminal interface
USEMODULE += stdio_rtt
TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh
TERMFLAGS = term-rtt
# HACK: replicate dependency resolution in Makefile.dep, only works
# if `USEMODULE` or `DEFAULT_MODULE` is set by the command line or in the
# application Makefile.
ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE)))
RIOT_TERMINAL ?= jlink
endif
include $(RIOTMAKE)/tools/serial.inc.mk
# use shared Makefile.include
include $(RIOTBOARD)/common/nrf52/Makefile.include

3
examples/gnrc_border_router/Makefile
View File

@ -7,9 +7,6 @@ BOARD ?= samr21-xpro
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..
# The following boards do not have an available UART
BOARD_BLACKLIST += pic32-wifire pic32-clicker ruuvitag thingy52
# use ethos (ethernet over serial) for network communication and stdio over
# UART, but not on native, as native has a tap interface towards the host.
ifeq (,$(filter native,$(BOARD)))

2
examples/suit_update/Makefile.ci
View File

@ -18,12 +18,10 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
nucleo-l073rz \
ruuvitag \
saml10-xpro \
saml11-xpro \
stm32f0discovery \
telosb \
thingy52 \
waspmote-pro \
wsn430-v1_3b \
wsn430-v1_4 \

3
makefiles/tools/serial.inc.mk
View File

@ -26,4 +26,7 @@ else ifeq ($(RIOT_TERMINAL),miniterm)
# The RIOT shell will still transmit back a CRLF, but at least with --eol LF
# we avoid sending two lines on every "enter".
TERMFLAGS ?= --eol LF "$(PORT)" "$(BAUD)"
else ifeq ($(RIOT_TERMINAL),jlink)
TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh
TERMFLAGS = term-rtt
endif

3
tests/gnrc_ipv6_ext/Makefile
View File

@ -2,9 +2,6 @@ DEVELHELP := 1
# name of your application
include ../Makefile.tests_common
# chronos, hamilton and ruuvitag boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag
export TAP ?= tap0
# use Ethernet as link-layer protocol

3
tests/gnrc_ipv6_ext_frag/Makefile
View File

@ -2,9 +2,6 @@ DEVELHELP := 1
# name of your application
include ../Makefile.tests_common
# chronos, hamilton, ruuvitag, and thingy52 boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag thingy52
export TAP ?= tap0
CFLAGS += -DOUTPUT=TEXT

3
tests/gnrc_rpl_srh/Makefile
View File

@ -2,9 +2,6 @@ DEVELHELP := 1
# name of your application
include ../Makefile.tests_common
# chronos, hamilton and ruuvitag boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag
export TAP ?= tap0
CFLAGS += -DOUTPUT=TEXT

3
tests/gnrc_sock_dns/Makefile
View File

@ -2,9 +2,6 @@ include ../Makefile.tests_common
RIOTBASE ?= $(CURDIR)/../..
# chronos, hamilton and ruuvitag boards don't support ethos
BOARD_BLACKLIST := chronos hamilton ruuvitag
export TAP ?= tap0
USEMODULE += sock_dns

3
tests/gnrc_tcp/Makefile
View File

@ -8,9 +8,6 @@ TAP ?= tap0
MSL_US ?= 1000000
TIMEOUT_US ?= 3000000
# unsupported by ethos: chronos, hamilton, ruuvitag
BOARD_BLACKLIST := chronos hamilton ruuvitag thingy52
# This test depends on tap device setup (only allowed by root)
# Suppress test execution to avoid CI errors
TEST_ON_CI_BLACKLIST += all