Skip to content

Commit 9857f11

Browse files
sylvioalveskartben
authored andcommitted
linker: esp32: move regi2c_ctrl to iram
This prevents boot lock up due to critical sections calls during bootloader stage. Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>
1 parent 6bfea73 commit 9857f11

File tree

6 files changed

+6
-2
lines changed

6 files changed

+6
-2
lines changed

soc/espressif/esp32/default.ld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ SECTIONS
428428
*libzephyr.a:mspi_timing_config.*(.literal .literal.* .text .text.*)
429429
*libzephyr.a:mspi_timing_tuning.*(.literal .literal.* .text .text.*)
430430
*libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
431+
*libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
431432
*(.literal.sar_periph_ctrl_power_enable .text.sar_periph_ctrl_power_enable)
432433

433434
*libzephyr.a:esp_system_chip.*(.literal.esp_system_abort .text.esp_system_abort)

soc/espressif/esp32c2/default.ld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ SECTIONS
236236
*liblib__libc__minimal.a:string.*(.literal .text .literal.* .text.*)
237237
*liblib__libc__picolib.a:string.*(.literal .text .literal.* .text.*)
238238
*libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
239+
*libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
239240
*libgcov.a:(.literal .text .literal.* .text.*)
240241
*libphy.a:( .phyiram .phyiram.*)
241242
*libc.a:*(.literal .text .literal.* .text.*)

soc/espressif/esp32c3/default.ld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ SECTIONS
330330
*liblib__libc__minimal.a:string.*(.literal .text .literal.* .text.*)
331331
*liblib__libc__picolib.a:string.*(.literal .text .literal.* .text.*)
332332
*libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
333+
*libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
333334
*libgcov.a:(.literal .text .literal.* .text.*)
334335
*libphy.a:( .phyiram .phyiram.*)
335336
*libc.a:*(.literal .text .literal.* .text.*)

soc/espressif/esp32c6/default.ld

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ SECTIONS
342342
*liblib__libc__minimal.a:string.*(.literal .text .literal.* .text.*)
343343
*liblib__libc__picolib.a:string.*(.literal .text .literal.* .text.*)
344344
*libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
345+
*libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
345346
*libgcov.a:(.literal .text .literal.* .text.*)
346347
*libphy.a:( .phyiram .phyiram.*)
347348
*libc.a:*(.literal .text .literal.* .text.*)
@@ -489,8 +490,6 @@ SECTIONS
489490
*libzephyr.a:secure_boot_secure_features.*(.literal .text .literal.* .text.*)
490491
*libzephyr.a:secure_boot_signatures_bootloader.*(.literal .text .literal.* .text.*)
491492

492-
*libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
493-
494493
*libzephyr.a:cpu_region_protect.*(.literal .text .literal.* .text.*)
495494

496495
/* TODO: optimise */

soc/espressif/esp32s2/default.ld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ SECTIONS
440440
*libzephyr.a:mspi_timing_config.*(.literal .literal.* .text .text.*)
441441
*libzephyr.a:mspi_timing_tuning.*(.literal .literal.* .text .text.*)
442442
*libzephyr.a:periph_ctrl.*(.literal .text .literal.* .text.*)
443+
*libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
443444
*(.literal.sar_periph_ctrl_power_enable .text.sar_periph_ctrl_power_enable)
444445

445446
/* [mapping:soc_pm] */

soc/espressif/esp32s3/default.ld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ SECTIONS
458458
*libzephyr.a:systimer.*(.literal .literal.* .text .text.*)
459459
*libzephyr.a:mspi_timing_config.*(.literal .literal.* .text .text.*)
460460
*libzephyr.a:mspi_timing_tuning.*(.literal .literal.* .text .text.*)
461+
*libzephyr.a:regi2c_ctrl.*(.literal .text .literal.* .text.*)
461462
*(.literal.sar_periph_ctrl_power_enable .text.sar_periph_ctrl_power_enable)
462463

463464
/* [mapping:soc_pm] */

0 commit comments

Comments
 (0)