Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix Intermittent ESP32 Crashes by Wrapping longjmp #10328

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 9, 2025
Merged

Fix Intermittent ESP32 Crashes by Wrapping longjmp #10328

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da2914
For Espressif boards:
eightycc May 8, 2025
06a2fe1
Merge branch 'adafruit:main' into issue-9937
eightycc May 9, 2025
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
29 changes: 18 additions & 11 deletions ports/espressif/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,21 +202,24 @@ else
endif

ifeq ($(IDF_TARGET_ARCH),xtensa)
# Remove the last two flags once TinyUSB is updated with the `#include <xtensa_api.h>` instead of
# `#include "xtensa/xtensa_api.h"`.
# Remove the last two flags once TinyUSB is updated with the `#include <xtensa_api.h>` instead of
# `#include "xtensa/xtensa_api.h"`.

CFLAGS += -mlongcalls -isystem esp-idf/components/xtensa/deprecated_include/ -Wno-error=cpp
CFLAGS += -mlongcalls -isystem esp-idf/components/xtensa/deprecated_include/ -Wno-error=cpp

# Wrap longjmp with a patched version that protects register window update with a critical section
LDFLAGS += -Wl,--wrap=longjmp
else ifeq ($(IDF_TARGET_ARCH),riscv)

ifeq ($(IDF_TARGET),esp32p4)
CFLAGS += -march=rv32imafc_zicsr_zifencei_xesppie -mabi=ilp32f
else
CFLAGS += -march=rv32imac_zicsr_zifencei
endif
ifeq ($(IDF_TARGET),esp32p4)
CFLAGS += -march=rv32imafc_zicsr_zifencei_xesppie -mabi=ilp32f
else
CFLAGS += -march=rv32imac_zicsr_zifencei
endif

LDFLAGS += \
-Lesp-idf/components/riscv/ld \
-Trom.api.ld
LDFLAGS += \
-Lesp-idf/components/riscv/ld \
-Trom.api.ld
endif

$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
Expand Down Expand Up @@ -546,6 +549,10 @@ else
DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-opt.defaults
endif

ifeq ($(ENABLE_JTAG), 1)
CFLAGS += -DENABLE_JTAG=1
endif

SDKCONFIGS := esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SIZE_SDKCONFIG);$(FLASH_MODE_SDKCONFIG);$(FLASH_SPEED_SDKCONFIG);$(PSRAM_SDKCONFIG);$(PSRAM_SIZE_SDKCONFIG);$(PSRAM_MODE_SDKCONFIG);$(PSRAM_SPEED_SDKCONFIG);$(TARGET_SDKCONFIG);boards/$(BOARD)/sdkconfig
ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
SDKCONFIGS := esp-idf-config/sdkconfig-ble.defaults;$(SDKCONFIGS)
Expand Down