diff --git a/boards/common/makefiles/stdio_cdc_acm.dep.mk b/boards/common/makefiles/stdio_cdc_acm.dep.mk index 1bbdcdf911..4800823512 100644 --- a/boards/common/makefiles/stdio_cdc_acm.dep.mk +++ b/boards/common/makefiles/stdio_cdc_acm.dep.mk @@ -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 diff --git a/boards/common/makefiles/stdio_tinyusb_cdc_acm.dep.mk b/boards/common/makefiles/stdio_tinyusb_cdc_acm.dep.mk index 8aae180b72..1254cd5955 100644 --- a/boards/common/makefiles/stdio_tinyusb_cdc_acm.dep.mk +++ b/boards/common/makefiles/stdio_tinyusb_cdc_acm.dep.mk @@ -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))) diff --git a/boards/esp32c3-wemos-mini/Makefile.dep b/boards/esp32c3-wemos-mini/Makefile.dep index 2b25c2a442..b2909c3d65 100644 --- a/boards/esp32c3-wemos-mini/Makefile.dep +++ b/boards/esp32c3-wemos-mini/Makefile.dep @@ -1,4 +1,4 @@ -ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) +ifneq (,$(filter stdio_default,$(USEMODULE))) USEMODULE += stdio_usb_serial_jtag endif diff --git a/boards/esp32s3-box/Makefile.dep b/boards/esp32s3-box/Makefile.dep index 1c09d058f4..5ee0fd4ec5 100644 --- a/boards/esp32s3-box/Makefile.dep +++ b/boards/esp32s3-box/Makefile.dep @@ -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))) diff --git a/boards/esp32s3-pros3/Makefile.dep b/boards/esp32s3-pros3/Makefile.dep index 4159038b8d..07891db96f 100644 --- a/boards/esp32s3-pros3/Makefile.dep +++ b/boards/esp32s3-pros3/Makefile.dep @@ -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))) diff --git a/boards/esp32s3-usb-otg/Makefile.dep b/boards/esp32s3-usb-otg/Makefile.dep index 88ec8eaa8b..bd175596d2 100644 --- a/boards/esp32s3-usb-otg/Makefile.dep +++ b/boards/esp32s3-usb-otg/Makefile.dep @@ -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 diff --git a/boards/esp32s3-wt32-sc01-plus/Makefile.dep b/boards/esp32s3-wt32-sc01-plus/Makefile.dep index 0128b651b3..ce4ce0fa9b 100644 --- a/boards/esp32s3-wt32-sc01-plus/Makefile.dep +++ b/boards/esp32s3-wt32-sc01-plus/Makefile.dep @@ -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 diff --git a/boards/hamilton/Makefile.dep b/boards/hamilton/Makefile.dep index 0c3f1f2795..6f96388ab7 100644 --- a/boards/hamilton/Makefile.dep +++ b/boards/hamilton/Makefile.dep @@ -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 diff --git a/boards/hip-badge/Makefile.dep b/boards/hip-badge/Makefile.dep index 840d0a4ca8..94128b55a2 100644 --- a/boards/hip-badge/Makefile.dep +++ b/boards/hip-badge/Makefile.dep @@ -1,4 +1,4 @@ -ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) +ifneq (,$(filter stdio_default,$(USEMODULE))) USEMODULE += stdio_usb_serial_jtag endif diff --git a/boards/pinetime/Makefile.dep b/boards/pinetime/Makefile.dep index 331a4cf3e7..b80599f39b 100644 --- a/boards/pinetime/Makefile.dep +++ b/boards/pinetime/Makefile.dep @@ -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 diff --git a/boards/ruuvitag/Makefile.dep b/boards/ruuvitag/Makefile.dep index 1944a9ab7a..a06987f43c 100644 --- a/boards/ruuvitag/Makefile.dep +++ b/boards/ruuvitag/Makefile.dep @@ -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 diff --git a/boards/thingy52/Makefile.dep b/boards/thingy52/Makefile.dep index a47e07b05e..e997e6e43c 100644 --- a/boards/thingy52/Makefile.dep +++ b/boards/thingy52/Makefile.dep @@ -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 diff --git a/cpu/native/Makefile.dep b/cpu/native/Makefile.dep index a41f94b2d5..cd33b6ea55 100644 --- a/cpu/native/Makefile.dep +++ b/cpu/native/Makefile.dep @@ -13,7 +13,7 @@ else endif endif -ifeq (,$(filter stdio_%,$(USEMODULE))) +ifneq (,$(filter stdio_default,$(USEMODULE))) USEMODULE += stdio_native endif