nrf52840dongle: Replicate adafruit-clue's behavior

chrysn · chrysn · commit 844a0db625bb · 2020-05-08T13:19:11.000+02:00
diff --git a/boards/nrf52840dongle/Makefile.dep b/boards/nrf52840dongle/Makefile.dep
@@ -3,8 +3,14 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
 endif
 
 # ethos only works on the UART-based stdio; when present, don't attempt to use CDC-ACM...
-ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
+ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE))))
   USEMODULE += stdio_cdc_acm
+  # This does not *really* hinge on the choice of stdio, but this ensures
+  # compatibility with the test suite that uses stdio_null and would conflict
+  # with bootloader_nrfutil.
+  # (Having the feature in is generally a good thing because as an indicator
+  # that it the resulting program is meant to be flashed using nrfutil).
+  FEATURES_REQUIRED += bootloader_nrfutil
 endif
 # ... and fall back to the UART-based stdio
 
diff --git a/boards/nrf52840dongle/Makefile.include b/boards/nrf52840dongle/Makefile.include
@@ -18,8 +18,6 @@ ifeq (nrfutil,$(PROGRAMMER))
   FLASHDEPS += $(HEXFILE).zip
   FLASHER = nrfutil
   FFLAGS = dfu usb-serial --port=${PORT} --package=$(HEXFILE).zip
-
-  FEATURES_REQUIRED += bootloader_nrfutil
 endif
 
 %.hex.zip: %.hex
