Merge pull request #17427 from gschorcht/cpu/esp8266/fix_ztimer_esp_w…

…ifi_problem cpu/esp8266: fix problems with ESP WiFi and migration to ztimer
RIOT-OS · Dec 21, 2021 · f9e3196 · f9e3196
2 parents 23ab843 + 48f59a1
commit f9e3196
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cpu/esp8266/Kconfig b/cpu/esp8266/Kconfig
@@ -29,6 +29,7 @@ config CPU_FAM_ESP8266
     select MODULE_ESP_SDK if TEST_KCONFIG
     select MODULE_PERIPH_COMMON if TEST_KCONFIG
     select MODULE_RTT_RTC if HAS_PERIPH_RTT && MODULE_PERIPH_RTC
+    select MODULE_ZTIMER_NO_PERIPH_RTT if MODULE_ESP_WIFI_ANY
 
 ## CPU Models
 config CPU_MODEL_ESP8266EX

diff --git a/cpu/esp8266/Makefile.dep b/cpu/esp8266/Makefile.dep
@@ -23,3 +23,8 @@ endif
 ifneq (,$(filter periph_rtc,$(USEMODULE)))
   USEMODULE += rtt_rtc
 endif
+
+ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
+  # avoid that ztimer_periph_rtt is used as backend
+  USEMODULE += ztimer_no_periph_rtt
+endif
diff --git a/cpu/esp8266/ld/esp8266.riot-os.ld b/cpu/esp8266/ld/esp8266.riot-os.ld
@@ -242,7 +242,7 @@ SECTIONS
     *freertos/*(.literal .text .literal.* .text.*)
     *freertos_common/*(.literal .text .literal.* .text.*)
     *periph/*(.literal .text .literal.* .text.*)
-    *ztimer/*(.literal .text .literal.* .text.*)
+    *ztimer_core/*(.literal .text .literal.* .text.*)
 
     *libhal.a:clock.o(.literal .text .literal.* .text.*)
     *libhal.a:int_asm--set_intclear.o(.literal .text .literal.* .text.*)