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/esp*: fixes for tests/pkg_spiffs and tests/pkg_littlefs #12890

Merged
merged 2 commits into from
Dec 6, 2019
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
4 changes: 2 additions & 2 deletions cpu/esp32/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ ifneq (,$(filter esp_eth,$(USEMODULE)))
endif

ifneq (,$(filter spiffs,$(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300
export RIOT_TEST_TIMEOUT = 120
endif

ifneq (,$(filter littlefs,$(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300
export RIOT_TEST_TIMEOUT = 120
endif

# ESP32 pseudomodules
Expand Down
5 changes: 3 additions & 2 deletions cpu/esp32/ld/esp32.common.ld
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ SECTIONS
*esp_idf_spi_flash.a:*(.literal .text .literal.* .text.*)
/* parts of RIOT that should to run in IRAM */
*core.a:*(.literal .text .literal.* .text.*)
/* *spiffs_fs.a:*(.literal .text .literal.* .text.*) */
/* *spiffs.a:*(.literal .text .literal.* .text.*) */
*spiffs_fs.a:*(.literal .text .literal.* .text.*)
*spiffs.a:*(.literal .text .literal.* .text.*)
*vfs.a:*(.literal .text .literal.* .text.*)

/* part of RIOT ports that should run in IRAM */
*cpu.a:*(.literal .text .literal.* .text.*)
Expand Down
4 changes: 2 additions & 2 deletions cpu/esp8266/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ ifneq (, $(filter esp_gdbstub, $(USEMODULE)))
endif

ifneq (, $(filter spiffs, $(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300
export RIOT_TEST_TIMEOUT = 200
endif

ifneq (, $(filter littlefs, $(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300
export RIOT_TEST_TIMEOUT = 200
endif

# regular Makefile
Expand Down