riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/esp32: unconditionally disable thin archives

Browse Source 
Thin archives also cause a boot loop when using the flash module.
To prevent further surprises, disable thin archives unconditionally
until the cause for this behaviour is known.
This commit is contained in:
Benjamin Valentin 2019-10-01 09:00:56 +02:00
parent c9aa1c3516
commit 0ca2ce0214
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/esp32/Makefile.dep
View File

@ -42,9 +42,6 @@ ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
# crypto and hashes produce symbol conflicts with esp_idf_wpa_supplicant_crypto # crypto and hashes produce symbol conflicts with esp_idf_wpa_supplicant_crypto
DISABLE_MODULE += crypto DISABLE_MODULE += crypto
DISABLE_MODULE += hashes DISABLE_MODULE += hashes
# thin archives trigger a reboot loop - see #12258
ARFLAGS = rcs
endif endif
ifneq (,$(filter esp_idf_nvs_flash,$(USEMODULE))) ifneq (,$(filter esp_idf_nvs_flash,$(USEMODULE)))

3
cpu/esp32/Makefile.include
View File

@ -112,6 +112,9 @@ OPTIONAL_CFLAGS_BLACKLIST += -gz
ASFLAGS += --longcalls --text-section-literals ASFLAGS += --longcalls --text-section-literals
# thin archives trigger a reboot loop - see #12258, #12035, #12346
ARFLAGS = rcs
ifneq ($(CONFIGS),) ifneq ($(CONFIGS),)
CFLAGS += $(CONFIGS) CFLAGS += $(CONFIGS)
endif endif