github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-04 03:56:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

libretiny: skip patch_linker.py entirely on BK72xx

Browse Source 
IRAM_ATTR is a no-op on BK72xx so there is nothing for the script to
patch or summarize. Guard the extra_scripts registration with a
COMPONENT_BK72XX check and drop the BK72xx variants from
KNOWN_VARIANTS.
This commit is contained in:
J. Nick Koston
2026-04-15 16:07:43 -10:00
parent f961f9bfb3
commit 1cc0ae5443
2 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/libretiny/__init__.py
+5 -6
View File
@@ -467,12 +467,11 @@ async def component_to_code(config):
# it for project source files only. GCC uses the last -O flag.
build_src_flags += " -Os"
cg.add_platformio_option("build_src_flags", build_src_flags)
# IRAM_ATTR routes ISR code into RAM-executable sections (see
# esphome/core/hal.h). Most families need no linker help; LN882H is the
# exception — its stock linker has no glob for ".sram.text", so this
# pre-link hook injects KEEP(*(.sram.text*)) into .flash_copysection.
# The script also prints a post-link summary on all non-BK72xx families.
cg.add_platformio_option("extra_scripts", ["pre:patch_linker.py"])
# IRAM_ATTR is a no-op on BK72xx (SDK masks FIQ+IRQ around flash ops).
# On other families, patch_linker.py routes .sram.text into the right
# RAM-executable output section and prints a post-link placement summary.
if FAMILY_COMPONENT[config[CONF_FAMILY]] != COMPONENT_BK72XX:
cg.add_platformio_option("extra_scripts", ["pre:patch_linker.py"])
# dummy version code
cg.add_define("USE_ARDUINO_VERSION_CODE", cg.RawExpression("VERSION_CODE(0, 0, 0)"))
# decrease web server stack size (16k words -> 4k words)
esphome/components/libretiny/patch_linker.py.script
+9 -18
View File
@@ -5,19 +5,17 @@ import os
import re
import subprocess
# ESPHome marks ISR code IRAM_ATTR, which on LibreTiny maps to a section
# that each family's linker routes into RAM-executable memory so the function
# is callable while flash is busy (see esphome/core/hal.h for the per-family
# section names).
# ESPHome marks ISR code IRAM_ATTR, which on LibreTiny maps to a per-family
# section routed into RAM-executable memory (see esphome/core/hal.h).
#
# Most families need no linker patching:
# This script is NOT loaded on BK72xx (IRAM_ATTR is a no-op there; the SDK
# masks FIQ+IRQ around flash writes). On the remaining families:
# - RTL8710B: hal.h uses section(".image2.ram.text"); stock linker consumes it.
# - RTL8720C: hal.h uses section(".sram.text"); stock linker consumes it.
# - BK72xx: IRAM_ATTR is a no-op (SDK masks FIQ+IRQ around flash writes).
# - LN882H: stock linker has no glob for ".sram.text", so we inject
# KEEP(*(.sram.text*)) into ".flash_copysection" (> RAM0 AT> FLASH).
#
# LN882H is the only family that needs patching: its stock linker has no glob
# that catches ".sram.text", so we inject KEEP(*(.sram.text*)) into the
# ".flash_copysection" output (which is flash-to-RAM0 copied at startup).
# All families also get a post-link summary showing where IRAM_ATTR landed.
_MARKER = "/* esphome .sram.text */"
@@ -51,10 +49,6 @@ def _detect(env):
KNOWN_VARIANTS = frozenset({
"BK7231N",
"BK7231T",
"BK7231Q",
"BK7251",
"LN882H",
"RTL8710B",
"RTL8720C",
@@ -169,8 +163,5 @@ if _patchers := _patchers_for(_variant):
# as a pre-link action so it executes once the linker scripts exist.
env.AddPreAction("$BUILD_DIR/${PROGNAME}.elf", _pre_link)
_BK72XX_VARIANTS = frozenset({"BK7231N", "BK7231T", "BK7231Q", "BK7251"})
# Post-link summary for every family where IRAM_ATTR places code in RAM.
if _variant not in _BK72XX_VARIANTS:
env.AddPostAction("$BUILD_DIR/${PROGNAME}.elf", _post_link)
# Post-link summary for every family that reaches this script.
env.AddPostAction("$BUILD_DIR/${PROGNAME}.elf", _post_link)