Skip to content

Commit 4d65b4e

Browse files
projectgusdpgeorge
authored andcommitted
esp32: Remove the ESP32 ringbuffer linker workaround.
Reverts workaround added in acbdbcd. According to the linked ESP-IDF issue this was only a problem for ESP-IDF V5.0.x, and support for versions older than V5.2 was dropped in 6e5d8d0. This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <[email protected]>
1 parent 4b1c666 commit 4d65b4e

File tree

3 files changed

+1
-44
lines changed

3 files changed

+1
-44
lines changed

ports/esp32/boards/sdkconfig.spiram

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192
1313
# to PSRAM bug workarounds. Apply some options to reduce the firmware size.
1414
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
1515
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
16-
# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y # Workaround required: see main_esp32/linker.lf
16+
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
1717
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
1818
CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y

ports/esp32/esp32_common.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,6 @@ list(APPEND IDF_COMPONENTS
193193
# Provide the default LD fragment if not set
194194
if (MICROPY_USER_LDFRAGMENTS)
195195
set(MICROPY_LDFRAGMENTS ${MICROPY_USER_LDFRAGMENTS})
196-
else()
197-
set(MICROPY_LDFRAGMENTS linker_esp32.lf)
198196
endif()
199197

200198
# Register the main IDF component.

ports/esp32/main/linker_esp32.lf

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)