Skip to content

Commit 6aeba18

Browse files
committed
Merge branch 'feature/misc_core_iram' into 'master'
feat(core): added option for placing more core functions in flash See merge request espressif/esp-idf!39489
2 parents a2b7ce6 + 4d27e1a commit 6aeba18

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

components/esp_rom/linker.lf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ entries:
99
esp_rom_cache_esp32s2_esp32s3 (noflash)
1010
if ESP_ROM_HAS_CACHE_WRITEBACK_BUG = y:
1111
esp_rom_cache_writeback_esp32s3 (noflash)
12-
if HEAP_TLSF_USE_ROM_IMPL = y && (ESP_ROM_TLSF_CHECK_PATCH = y || HEAP_TLSF_CHECK_PATCH = y):
13-
esp_rom_tlsf (noflash)
1412
if SOC_SYSTIMER_SUPPORTED = y:
1513
esp_rom_systimer (noflash)
1614
if HAL_WDT_USE_ROM_IMPL = y:

components/freertos/linker.lf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,12 +310,12 @@ entries:
310310
# - Critical sections functions are always placed in internal RAM for better performance
311311
# - The following functions are also placed in internal RAM as they are called from vTaskSwitchContext, which is
312312
# also always placed in internal RAM
313-
# - vApplicationStackOverflowHook
314313
# - vPortSetStackWatchpoint
315314
# --------------------------------------------------------------------------------------------------------------
316315
if IDF_TARGET_ARCH_XTENSA = y:
317316
port:xPortStartScheduler (default)
318317
port:vPortEndScheduler (default)
318+
port:vApplicationStackOverflowHook (default)
319319
if FREERTOS_TASK_FUNCTION_WRAPPER = y:
320320
port:vPortTaskWrapper (default)
321321
if SOC_CPU_COPROC_NUM > 0:
@@ -342,14 +342,14 @@ entries:
342342
# - Critical sections functions are always placed in internal RAM for better performance
343343
# - The following functions are also placed in internal RAM as they are called from vTaskSwitchContext, which is
344344
# also always placed in internal RAM
345-
# - vApplicationStackOverflowHook
346345
# - vPortSetStackWatchpoint
347346
# - vPortCoprocUsedInISR is directly called from RISC-V assembly code with a direct branch instruction which
348347
# may be too far when placed in Flash. Hence, it is always placed in internal RAM
349348
# --------------------------------------------------------------------------------------------------------------
350349
if IDF_TARGET_ARCH_RISCV = y:
351350
port:xPortStartScheduler (default)
352351
port:vPortEndScheduler (default)
352+
port:vApplicationStackOverflowHook (default)
353353
port:uxInitialiseStackTLS (default)
354354
if FREERTOS_TASK_FUNCTION_WRAPPER = y:
355355
port:vPortTaskWrapper (default)

0 commit comments

Comments
 (0)