1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-15 09:33:50 +01:00

boards: move to stdio_default

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

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)))
# Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly
# and tinyusb_device is used for any other reason

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.
# and usbus is used for any other reason
ifneq (,$(filter usbus,$(USEMODULE)))

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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