From 4d70d939cadb9e9a8e9f4397089d107c052a5bbc Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Wed, 8 Dec 2021 14:16:17 +0100
Subject: [PATCH 01/14] sys/evtimer,ztimer: do not depend on ztimer_now64

---
 sys/ztimer/Makefile.dep | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys/ztimer/Makefile.dep b/sys/ztimer/Makefile.dep
index 1042f47e27..72a2a3239b 100644
--- a/sys/ztimer/Makefile.dep
+++ b/sys/ztimer/Makefile.dep
@@ -34,7 +34,6 @@ endif
 # make evtimer use ztimer_msec as low level timer
 ifneq (,$(filter evtimer_on_ztimer,$(USEMODULE)))
   USEMODULE += ztimer_msec
-  USEMODULE += ztimer_now64
 endif
 
 # "ztimer_xtimer_compat" is a wrapper of the xtimer API on ztimer_used

From 95767ec9b58d4b8fe2512a00354b923361480452 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Wed, 8 Dec 2021 16:28:16 +0100
Subject: [PATCH 02/14] sys/evtimer: deprecate evtimer_now_min

---
 sys/include/evtimer.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys/include/evtimer.h b/sys/include/evtimer.h
index 7727d021a1..9cdcc6240f 100644
--- a/sys/include/evtimer.h
+++ b/sys/include/evtimer.h
@@ -137,6 +137,9 @@ static inline uint32_t evtimer_now_msec(void)
 
 /**
  * @brief   Return the current system time in minutes
+ *
+ * @deprecated wrongly placed convenience function, that
+ *             may not work as expected with ztimer (32 bit)
  */
 static inline uint32_t evtimer_now_min(void)
 {

From 937efda843d7daaa171c14101a2340c9d33d3fa9 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Wed, 8 Dec 2021 19:26:03 +0100
Subject: [PATCH 03/14] test/evtimer_underflow: test shall not need a blocking
 timer set

xtimer for short timouts is blocking (spin) this was needed for this test to pass
by sleeping in main we no longer need the timer set to wait
---
 tests/evtimer_underflow/Makefile |  1 +
 tests/evtimer_underflow/main.c   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/evtimer_underflow/Makefile b/tests/evtimer_underflow/Makefile
index e9e3214d84..0c65537ed2 100644
--- a/tests/evtimer_underflow/Makefile
+++ b/tests/evtimer_underflow/Makefile
@@ -1,5 +1,6 @@
 include ../Makefile.tests_common
 
 USEMODULE += evtimer
+USEMODULE += xtimer
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/evtimer_underflow/main.c b/tests/evtimer_underflow/main.c
index 7fd694ac17..89768ee4ec 100644
--- a/tests/evtimer_underflow/main.c
+++ b/tests/evtimer_underflow/main.c
@@ -23,6 +23,7 @@
 #include "evtimer_msg.h"
 #include "thread.h"
 #include "msg.h"
+#include "xtimer.h"
 
 #define WORKER_MSG_QUEUE_SIZE   (8)
 
@@ -45,7 +46,7 @@ static evtimer_msg_event_t events[] = {
 /* This thread will print the drift to stdout once per second */
 void *worker_thread(void *arg)
 {
-    (void) arg;
+    (void)arg;
 
     msg_init_queue(worker_msg_queue, WORKER_MSG_QUEUE_SIZE);
     while (1) {
@@ -58,6 +59,11 @@ void *worker_thread(void *arg)
     }
 }
 
+void sleep_msec(uint16_t t)
+{
+    xtimer_msleep(t);
+}
+
 int main(void)
 {
     evtimer_init_msg(&evtimer);
@@ -67,9 +73,11 @@ int main(void)
                                      THREAD_PRIORITY_MAIN - 1,
                                      THREAD_CREATE_STACKTEST,
                                      worker_thread, NULL, "worker");
+
     while (1) {
         for (unsigned i = 0; i < NEVENTS; i++) {
             evtimer_add_msg(&evtimer, &events[i], pid);
+            sleep_msec(10);
         }
     }
 }

From 0a3dd441ceef996f61519ee6006b3a7ed6be5ee8 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 17:10:32 +0100
Subject: [PATCH 04/14] net/gnrc_sock: do not include xtimer.h without xtimer
 module

---
 sys/net/gnrc/sock/gnrc_sock.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/net/gnrc/sock/gnrc_sock.c b/sys/net/gnrc/sock/gnrc_sock.c
index 5ad7d2b1ee..0cfe84a922 100644
--- a/sys/net/gnrc/sock/gnrc_sock.c
+++ b/sys/net/gnrc/sock/gnrc_sock.c
@@ -26,7 +26,9 @@
 #include "net/gnrc/tx_sync.h"
 #include "net/udp.h"
 #include "utlist.h"
+#ifdef MODULE_XTIMER
 #include "xtimer.h"
+#endif
 
 #include "sock_types.h"
 #include "gnrc_sock_internal.h"

From 1e31818f9e286ccf0e44545900204153e6f4963d Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 17:12:28 +0100
Subject: [PATCH 05/14] sys/benchmark_upd: depends on xtimer

---
 sys/test_utils/Makefile.dep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/test_utils/Makefile.dep b/sys/test_utils/Makefile.dep
index ac95f8211e..bdf6400802 100644
--- a/sys/test_utils/Makefile.dep
+++ b/sys/test_utils/Makefile.dep
@@ -8,4 +8,5 @@ ifneq (,$(filter benchmark_udp,$(USEMODULE)))
   USEMODULE += netutils
   USEMODULE += sema_inv
   USEMODULE += sock_udp
+  USEMODULE += xtimer
 endif

From 0a25554ca7508e9353839f35d662a11852f87807 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 18:18:47 +0100
Subject: [PATCH 06/14] net/uhcpc: depends on xtimer

---
 sys/Makefile.dep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/Makefile.dep b/sys/Makefile.dep
index 0fb9a0d1b8..5bbfc69e12 100644
--- a/sys/Makefile.dep
+++ b/sys/Makefile.dep
@@ -154,6 +154,7 @@ endif
 
 ifneq (,$(filter uhcpc,$(USEMODULE)))
   USEMODULE += posix_inet
+  USEMODULE += xtimer
 endif
 
 ifneq (,$(filter netdev_tap,$(USEMODULE)))

From 427df6d59d5d0f10e93535f8d0f3cba51061cc78 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 18:34:04 +0100
Subject: [PATCH 07/14] suit: example doesn't need xtimer suit_coap needs
 xtimer

---
 examples/suit_update/main.c | 1 -
 sys/Makefile.dep            | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/suit_update/main.c b/examples/suit_update/main.c
index 2263b43aba..58dbd650be 100644
--- a/examples/suit_update/main.c
+++ b/examples/suit_update/main.c
@@ -23,7 +23,6 @@
 #include "thread.h"
 #include "irq.h"
 #include "net/nanocoap_sock.h"
-#include "xtimer.h"
 
 #include "shell.h"
 
diff --git a/sys/Makefile.dep b/sys/Makefile.dep
index 5bbfc69e12..8fe3156298 100644
--- a/sys/Makefile.dep
+++ b/sys/Makefile.dep
@@ -745,6 +745,7 @@ endif
 
 ifneq (,$(filter suit_transport_coap, $(USEMODULE)))
   USEMODULE += nanocoap_sock
+  USEMODULE += xtimer
   USEMODULE += sock_util
 endif
 

From af4381db07d7f950adaa09cd4a5411bccf37c8a4 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 18:44:11 +0100
Subject: [PATCH 08/14] pkg/tinydtls: depends on xtimer

---
 pkg/tinydtls/Makefile.dep        | 1 +
 pkg/tinydtls/contrib/sock_dtls.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/tinydtls/Makefile.dep b/pkg/tinydtls/Makefile.dep
index c567f46953..7e41357280 100644
--- a/pkg/tinydtls/Makefile.dep
+++ b/pkg/tinydtls/Makefile.dep
@@ -5,6 +5,7 @@ USEMODULE += hashes
 USEMODULE += random
 USEMODULE += tinydtls_aes
 USEMODULE += tinydtls_ecc
+USEMODULE += xtimer
 
 # TinyDTLS only has support for 32-bit architectures ATM
 FEATURES_REQUIRED += arch_32bit
diff --git a/pkg/tinydtls/contrib/sock_dtls.c b/pkg/tinydtls/contrib/sock_dtls.c
index 2705f0a106..41fc7f66e4 100644
--- a/pkg/tinydtls/contrib/sock_dtls.c
+++ b/pkg/tinydtls/contrib/sock_dtls.c
@@ -22,6 +22,7 @@
 #include "log.h"
 #include "net/sock/dtls.h"
 #include "net/credman.h"
+#include "xtimer.h"
 
 #if SOCK_HAS_ASYNC
 #include "net/sock/async.h"

From af13447238f8a2d0b4e0aeec0aa48000c2ebf02b Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 18:59:10 +0100
Subject: [PATCH 09/14] gnrc/ipv6_auto_subnets: depend on xtimer

---
 sys/net/gnrc/Makefile.dep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/net/gnrc/Makefile.dep b/sys/net/gnrc/Makefile.dep
index 69d86cd766..5412553a85 100644
--- a/sys/net/gnrc/Makefile.dep
+++ b/sys/net/gnrc/Makefile.dep
@@ -124,7 +124,7 @@ ifneq (,$(filter gnrc_ipv6_auto_subnets,$(USEMODULE)))
   USEMODULE += gnrc_ipv6_nib_rtr_adv_pio_cb
   CFLAGS += -DCONFIG_GNRC_IPV6_NIB_ADV_ROUTER=0
   CFLAGS += -DCONFIG_GNRC_IPV6_NIB_ADD_RIO_IN_LAST_RA=1
-
+  USEMODULE += xtimer
   ifeq (,$(filter gnrc_ipv6_auto_subnets_simple,$(USEMODULE)))
     DEFAULT_MODULE += gnrc_ipv6_auto_subnets_auto_init
     USEMODULE += gnrc_udp

From 9f285f319e4627b3024142e255a7dc37c56449bd Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 19:06:33 +0100
Subject: [PATCH 10/14] test/gnrc_udp: depends on xtimer

---
 tests/gnrc_sock_udp/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/gnrc_sock_udp/Makefile b/tests/gnrc_sock_udp/Makefile
index caa22a1f4c..66fbd83ad5 100644
--- a/tests/gnrc_sock_udp/Makefile
+++ b/tests/gnrc_sock_udp/Makefile
@@ -20,6 +20,8 @@ USEMODULE += gnrc_sock_check_reuse
 USEMODULE += sock_udp
 USEMODULE += gnrc_ipv6
 USEMODULE += ps
+USEMODULE += xtimer
+
 
 CFLAGS += -DTEST_SUITES
 

From 53387d83e8584d2da54ead8b38095958e34484a9 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 19:18:00 +0100
Subject: [PATCH 11/14] example/nanocoap_server: depends on xtimer

---
 examples/nanocoap_server/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/nanocoap_server/Makefile b/examples/nanocoap_server/Makefile
index e09f05d618..a7851cb462 100644
--- a/examples/nanocoap_server/Makefile
+++ b/examples/nanocoap_server/Makefile
@@ -19,6 +19,8 @@ USEMODULE += gnrc_icmpv6_echo
 
 USEMODULE += nanocoap_sock
 
+USEMODULE += xtimer
+
 # include this for nicely formatting the returned internal value
 USEMODULE += fmt
 

From 6473c5c1f7a4120613894ef210f89920cd3b5d38 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 19:45:28 +0100
Subject: [PATCH 12/14] test/gnrc_sock_ip: depends on xtimer

---
 tests/gnrc_sock_ip/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/gnrc_sock_ip/Makefile b/tests/gnrc_sock_ip/Makefile
index 212af52183..2c49a4d2a7 100644
--- a/tests/gnrc_sock_ip/Makefile
+++ b/tests/gnrc_sock_ip/Makefile
@@ -20,6 +20,8 @@ USEMODULE += sock_ip
 USEMODULE += gnrc_ipv6
 USEMODULE += ps
 
+USEMODULE += xtimer
+
 CFLAGS += -DTEST_SUITES
 
 include $(RIOTBASE)/Makefile.include

From 5dfe59b9dc9e695c97d7ce7657e970c66b14b250 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 22:31:08 +0100
Subject: [PATCH 13/14] test/pkg_microcoap: depends on xtimer

---
 tests/pkg_microcoap/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/pkg_microcoap/Makefile b/tests/pkg_microcoap/Makefile
index a82713e833..40a1560527 100644
--- a/tests/pkg_microcoap/Makefile
+++ b/tests/pkg_microcoap/Makefile
@@ -11,6 +11,8 @@ USEMODULE += gnrc_icmpv6_echo
 
 USEMODULE += sock_udp
 
+USEMODULE += xtimer
+
 USEPKG += microcoap
 
 # include this for printing IP addresses

From f30433caf677eef459aac2b16b2b146e8ec45989 Mon Sep 17 00:00:00 2001
From: Karl Fessel <karl.fessel@ovgu.de>
Date: Mon, 13 Dec 2021 22:39:56 +0100
Subject: [PATCH 14/14] tests: adds some INSUFFICIENT_MEMORY boards

---
 tests/driver_encx24j600/Makefile.ci   | 2 ++
 tests/gnrc_dhcpv6_relay/Makefile.ci   | 3 +++
 tests/gnrc_sock_neterr/Makefile.ci    | 2 ++
 tests/riotboot_flashwrite/Makefile.ci | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/tests/driver_encx24j600/Makefile.ci b/tests/driver_encx24j600/Makefile.ci
index 7f7f4d0b7d..a7af604521 100644
--- a/tests/driver_encx24j600/Makefile.ci
+++ b/tests/driver_encx24j600/Makefile.ci
@@ -6,6 +6,7 @@ BOARD_INSUFFICIENT_MEMORY := \
     arduino-uno \
     atmega328p \
     atmega328p-xplained-mini \
+    bluepill-stm32f030c8 \
     i-nucleo-lrwan1 \
     msb-430 \
     msb-430h \
@@ -15,6 +16,7 @@ BOARD_INSUFFICIENT_MEMORY := \
     nucleo-l031k6 \
     nucleo-l053r8 \
     samd10-xmini \
+    slstk3400a \
     stk3200 \
     stm32f030f4-demo \
     stm32f0discovery \
diff --git a/tests/gnrc_dhcpv6_relay/Makefile.ci b/tests/gnrc_dhcpv6_relay/Makefile.ci
index 6758e3e608..588ca0834e 100644
--- a/tests/gnrc_dhcpv6_relay/Makefile.ci
+++ b/tests/gnrc_dhcpv6_relay/Makefile.ci
@@ -10,7 +10,10 @@ BOARD_INSUFFICIENT_MEMORY := \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
     derfmega128 \
+    hifive1 \
+    hifive1b \
     i-nucleo-lrwan1 \
+    im880b \
     mega-xplained \
     microduino-corerf \
     msb-430 \
diff --git a/tests/gnrc_sock_neterr/Makefile.ci b/tests/gnrc_sock_neterr/Makefile.ci
index 1d21bb5900..c9a849f3da 100644
--- a/tests/gnrc_sock_neterr/Makefile.ci
+++ b/tests/gnrc_sock_neterr/Makefile.ci
@@ -8,7 +8,9 @@ BOARD_INSUFFICIENT_MEMORY := \
     nucleo-f031k6 \
     nucleo-f042k6 \
     nucleo-l011k4 \
+    nucleo-l031k6\
     samd10-xmini \
     stk3200 \
     stm32f030f4-demo \
+    stm32g0316-disco \
     #
diff --git a/tests/riotboot_flashwrite/Makefile.ci b/tests/riotboot_flashwrite/Makefile.ci
index 72dd2925fb..03bcaa9010 100644
--- a/tests/riotboot_flashwrite/Makefile.ci
+++ b/tests/riotboot_flashwrite/Makefile.ci
@@ -16,8 +16,10 @@ BOARD_INSUFFICIENT_MEMORY := \
     nucleo-f334r8 \
     nucleo-g070rb \
     nucleo-g071rb \
+    nucleo-g431rb \
     nucleo-l031k6 \
     nucleo-l053r8 \
+    nucleo-l412kb \
     saml10-xpro \
     saml11-xpro \
     slstk3400a \