Skip to content

Fix HybridCompile for esp32 when a boards manifest is used without PSRAM #337

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 1 commit into from
Nov 13, 2025
Merged

Fix HybridCompile for esp32 when a boards manifest is used without PSRAM #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions builder/frameworks/arduino.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,13 +575,29 @@ def has_unicore_flags():
or flag in board_sdkconfig for flag in UNICORE_FLAGS)


# Esp32-solo1 libs settings
if flag_custom_sdkconfig and has_unicore_flags():
def has_psram_config():
"""Check if PSRAM is configured in extra_flags, entry_custom_sdkconfig or board_sdkconfig"""
return ("PSRAM" in extra_flags or "PSRAM" in entry_custom_sdkconfig
or "PSRAM" in board_sdkconfig or "CONFIG_SPIRAM=y" in extra_flags
or "CONFIG_SPIRAM=y" in entry_custom_sdkconfig
or "CONFIG_SPIRAM=y" in board_sdkconfig)


# Esp32 settings for solo1 and PSRAM
if flag_custom_sdkconfig:
if not env.get('BUILD_UNFLAGS'): # Initialize if not set
env['BUILD_UNFLAGS'] = []

build_unflags = (" ".join(env['BUILD_UNFLAGS']) +
" -mdisable-hardware-atomics -ustart_app_other_cores")
build_unflags = " ".join(env['BUILD_UNFLAGS'])

# -mdisable-hardware-atomics: always for solo1, or when PSRAM is NOT configured
if has_unicore_flags() or not has_psram_config():
build_unflags += " -mdisable-hardware-atomics"

# -ustart_app_other_cores only and always for solo1
if has_unicore_flags():
build_unflags += " -ustart_app_other_cores"

new_build_unflags = build_unflags.split()
env.Replace(BUILD_UNFLAGS=new_build_unflags)

Expand Down