Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/esp8266: fix problems with ESP WiFi and migration to ztimer #17427

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cpu/esp8266/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions cpu/esp8266/Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cpu/esp8266/ld/esp8266.riot-os.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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.*)
Expand Down