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

boards: move to stdio_default

Browse Source
This commit is contained in:
Benjamin Valentin 2025-03-13 10:54:13 +01:00
parent 171d5ff315
commit 233a62b792
13 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/common/makefiles/stdio_cdc_acm.dep.mk
View File

@ -1,4 +1,4 @@
ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) ifneq (,$(filter stdio_default,$(USEMODULE)))
ifneq (,$(filter tinyusb_device,$(USEMODULE))$(filter tinyusb,$(USEPKG))) ifneq (,$(filter tinyusb_device,$(USEMODULE))$(filter tinyusb,$(USEPKG)))
# Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly # Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly
# and tinyusb_device is used for any other reason # and tinyusb_device is used for any other reason

2
boards/common/makefiles/stdio_tinyusb_cdc_acm.dep.mk
View File

@ -1,4 +1,4 @@
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
# Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly. # Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly.
# and usbus is used for any other reason # and usbus is used for any other reason
ifneq (,$(filter usbus,$(USEMODULE))) ifneq (,$(filter usbus,$(USEMODULE)))

2
boards/esp32c3-wemos-mini/Makefile.dep
View File

@ -1,4 +1,4 @@
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
USEMODULE += stdio_usb_serial_jtag USEMODULE += stdio_usb_serial_jtag
endif endif

22
boards/esp32s3-box/Makefile.dep
View File

@ -1,13 +1,15 @@
ifeq (,$(filter stdio_% slipdev_stdio usbus usbus% tinyusb_device,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
# Use stdio_usb_serial_jtag if no other stdio is requested explicitly ifeq (,$(filter usbus usbus% tinyusb_device,$(USEMODULE)))
# and neither USBUS nor tinyusb_device are used # Use stdio_usb_serial_jtag if no other stdio is requested explicitly
USEMODULE += stdio_usb_serial_jtag # and neither USBUS nor tinyusb_device are used
# Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled USEMODULE += stdio_usb_serial_jtag
# since there should be a CDC ACM interface in any case. This is necessary, # Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled
# for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm # since there should be a CDC ACM interface in any case. This is necessary,
# was previously used. # for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm
USEMODULE += usb_board_reset # was previously used.
# include $(RIOTMAKE)/tools/usb_board_reset.mk USEMODULE += usb_board_reset
# include $(RIOTMAKE)/tools/usb_board_reset.mk
endif
endif endif
ifneq (,$(filter disp_dev,$(USEMODULE))) ifneq (,$(filter disp_dev,$(USEMODULE)))

22
boards/esp32s3-pros3/Makefile.dep
View File

@ -1,13 +1,15 @@
ifeq (,$(filter stdio_% slipdev_stdio usbus usbus% tinyusb_device,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
# Use stdio_usb_serial_jtag if no other stdio is requested explicitly ifeq (,$(filter usbus usbus% tinyusb_device,$(USEMODULE)))
# and neither USBUS nor tinyusb_device are used # Use stdio_usb_serial_jtag if no other stdio is requested explicitly
USEMODULE += stdio_usb_serial_jtag # and neither USBUS nor tinyusb_device are used
# Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled USEMODULE += stdio_usb_serial_jtag
# since there should be a CDC ACM interface in any case. This is necessary, # Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled
# for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm # since there should be a CDC ACM interface in any case. This is necessary,
# was previously used. # for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm
USEMODULE += usb_board_reset # was previously used.
include $(RIOTMAKE)/tools/usb_board_reset.mk USEMODULE += usb_board_reset
include $(RIOTMAKE)/tools/usb_board_reset.mk
endif
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

22
boards/esp32s3-usb-otg/Makefile.dep
View File

@ -1,13 +1,15 @@
ifeq (,$(filter stdio_% slipdev_stdio usbus usbus% tinyusb_device,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
# Use stdio_usb_serial_jtag if no other stdio is requested explicitly ifeq (,$(filter usbus usbus% tinyusb_device,$(USEMODULE)))
# and neither USBUS nor tinyusb_device are used # Use stdio_usb_serial_jtag if no other stdio is requested explicitly
USEMODULE += stdio_usb_serial_jtag # and neither USBUS nor tinyusb_device are used
# Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled USEMODULE += stdio_usb_serial_jtag
# since there should be a CDC ACM interface in any case. This is necessary, # Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled
# for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm # since there should be a CDC ACM interface in any case. This is necessary,
# was previously used. # for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm
USEMODULE += usb_board_reset # was previously used.
include $(RIOTMAKE)/tools/usb_board_reset.mk USEMODULE += usb_board_reset
include $(RIOTMAKE)/tools/usb_board_reset.mk
endif
endif endif
include $(RIOTBOARD)/common/esp32s3/Makefile.dep include $(RIOTBOARD)/common/esp32s3/Makefile.dep

22
boards/esp32s3-wt32-sc01-plus/Makefile.dep
View File

@ -1,13 +1,15 @@
ifeq (,$(filter stdio_% slipdev_stdio usbus usbus% tinyusb_device,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
# Use stdio_usb_serial_jtag if no other stdio is requested explicitly ifeq (,$(filter usbus usbus% tinyusb_device,$(USEMODULE)))
# and neither USBUS nor tinyusb_device are used # Use stdio_usb_serial_jtag if no other stdio is requested explicitly
USEMODULE += stdio_usb_serial_jtag # and neither USBUS nor tinyusb_device are used
# Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled USEMODULE += stdio_usb_serial_jtag
# since there should be a CDC ACM interface in any case. This is necessary, # Even if only stdio_usb_serial_jtag is enabled, usb_board_reset is enabled
# for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm # since there should be a CDC ACM interface in any case. This is necessary,
# was previously used. # for example, to reset the board if stdio_cdc_acm or stdio_tinyusb_cdc_acm
USEMODULE += usb_board_reset # was previously used.
# include $(RIOTMAKE)/tools/usb_board_reset.mk USEMODULE += usb_board_reset
# include $(RIOTMAKE)/tools/usb_board_reset.mk
endif
endif endif
include $(RIOTBOARD)/common/esp32s3/Makefile.dep include $(RIOTBOARD)/common/esp32s3/Makefile.dep

2
boards/hamilton/Makefile.dep
View File

@ -14,6 +14,6 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
endif endif
# Use Segger's RTT unless another stdio_% is already used # Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
USEMODULE += stdio_rtt USEMODULE += stdio_rtt
endif endif

2
boards/hip-badge/Makefile.dep
View File

@ -1,4 +1,4 @@
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
USEMODULE += stdio_usb_serial_jtag USEMODULE += stdio_usb_serial_jtag
endif endif

2
boards/pinetime/Makefile.dep
View File

@ -1,5 +1,5 @@
# Use Segger's RTT unless another stdio_% is already used # Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
USEMODULE += stdio_rtt USEMODULE += stdio_rtt
endif endif

2
boards/ruuvitag/Makefile.dep
View File

@ -5,7 +5,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
endif endif
# Use Segger's RTT unless another stdio_% is already used # Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
USEMODULE += stdio_rtt USEMODULE += stdio_rtt
endif endif

2
boards/thingy52/Makefile.dep
View File

@ -5,7 +5,7 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
endif endif
# Use Segger's RTT unless another stdio_% is already used # Use Segger's RTT unless another stdio_% is already used
ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
USEMODULE += stdio_rtt USEMODULE += stdio_rtt
endif endif

2
cpu/native/Makefile.dep
View File

@ -13,7 +13,7 @@ else
endif endif
endif endif
ifeq (,$(filter stdio_%,$(USEMODULE))) ifneq (,$(filter stdio_default,$(USEMODULE)))
USEMODULE += stdio_native USEMODULE += stdio_native
endif endif