From d2628e89b489ad51d5e1b6d3a7e2dae82ab0dbce Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Thu, 18 May 2023 21:37:19 +0200
Subject: [PATCH 1/2] boards/adafruit-clue: use shared usb_board_reset.mk for
 flashing

---
 boards/adafruit-clue/Makefile.include | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/boards/adafruit-clue/Makefile.include b/boards/adafruit-clue/Makefile.include
index 50cd70b7ab..5bff4c0f44 100644
--- a/boards/adafruit-clue/Makefile.include
+++ b/boards/adafruit-clue/Makefile.include
@@ -8,18 +8,5 @@ ifeq ($(PROGRAMMER),adafruit-nrfutil)
   # The preinstalled bootloader must also be taken into account so
   # ROM_OFFSET skips the space taken by such bootloader.
   ROM_OFFSET = 0x26000
-
-  ifneq (,$(filter reset flash flash-only, $(MAKECMDGOALS)))
-    # Add 2 seconds delay before opening terminal: this is required when opening
-    # the terminal right after flashing. In this case, the stdio over USB needs
-    # some time after reset before being ready.
-    TERM_DELAY = 2
-    TERMDEPS += term-delay
-  endif
+  include $(RIOTMAKE)/tools/usb_board_reset.mk
 endif
-
-term-delay:
-	sleep $(TERM_DELAY)
-
-TESTRUNNER_CONNECT_DELAY ?= $(TERM_DELAY)
-$(call target-export-variables,test,TESTRUNNER_CONNECT_DELAY)

From f25731e88a7b5c1efb8adcc44dc0dd4a8894fed6 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Thu, 18 May 2023 21:41:54 +0200
Subject: [PATCH 2/2] make/usb_board_reset: define {preflash,term}-delay when
 necessary

---
 makefiles/tools/usb_board_reset.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/makefiles/tools/usb_board_reset.mk b/makefiles/tools/usb_board_reset.mk
index fbc6dd4bbe..be2e30ce12 100644
--- a/makefiles/tools/usb_board_reset.mk
+++ b/makefiles/tools/usb_board_reset.mk
@@ -28,8 +28,12 @@ RESET ?= $(PREFLASHER) $(RESETFFLASG)
 TESTRUNNER_CONNECT_DELAY ?= $(TERM_DELAY)
 $(call target-export-variables,test,TESTRUNNER_CONNECT_DELAY)
 
+ifneq (,$(filter flash flash-only,$(MAKECMDGOALS)))
 preflash-delay: preflash
 	sleep $(PREFLASH_DELAY)
+endif
 
+ifneq (,$(filter term,$(MAKECMDGOALS)))
 term-delay: $(TERMDELAYDEPS)
 	sleep $(TERM_DELAY)
+endif