Skip to content

Commit 279f4b8

Browse files
sylvioalvesmmahadevan108
authored andcommitted
soc: esp32s2: update linker files
Add new wifi sections into iram area. Add new functions to iram area. Remove unused entries. Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>
1 parent a1a6e8a commit 279f4b8

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

soc/espressif/esp32s2/default.ld

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ SECTIONS
362362
/* [mapping:hal] */
363363
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
364364
*libzephyr.a:cache_hal.*(.literal .text .literal.* .text.*)
365+
*libzephyr.a:cache_utils.*(.literal .text .literal.* .text.*)
365366
*libzephyr.a:ledc_hal_iram.*(.literal .text .literal.* .text.*)
366367
*libzephyr.a:i2c_hal_iram.*(.literal .text .literal.* .text.*)
367368
*libzephyr.a:wdt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -395,6 +396,7 @@ SECTIONS
395396
*libzephyr.a:spi_flash_wrap.*(.literal .literal.* .text .text.*)
396397
*libzephyr.a:spi_flash_hpm_enable.*(.literal .literal.* .text .text.*)
397398
*libzephyr.a:spi_flash_oct_flash_init*(.literal .literal.* .text .text.*)
399+
*libzephyr.a:flash_ops.*(.literal .literal.* .text .text.*)
398400

399401
/* [mapping:esp_system] */
400402
*libzephyr.a:esp_err.*(.literal .literal.* .text .text.*)
@@ -438,8 +440,8 @@ SECTIONS
438440
*libzephyr.a:bootloader_random*.*(.literal.bootloader_random_enable .text.bootloader_random_enable)
439441

440442
#if defined(CONFIG_ESP32_WIFI_IRAM_OPT)
441-
*libnet80211.a:(.wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.*)
442-
*libpp.a:(.wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiorslpiram .wifiorslpiram.*)
443+
*libnet80211.a:(.wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiextrairam .wifiextrairam.*)
444+
*libpp.a:(.wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiorslpiram .wifiorslpiram.* .wifiextrairam .wifiextrairam.*)
443445
*libcoexist.a:(.wifi_slp_iram .wifi_slp_iram.*)
444446

445447
/* [mapping:esp_wifi] */
@@ -603,6 +605,7 @@ SECTIONS
603605
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
604606
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)
605607
*libzephyr.a:cache_hal.*(.rodata .rodata.*)
608+
*libzephyr.a:cache_utils.*(.rodata .rodata.*)
606609
*libzephyr.a:ledc_hal_iram.*(.rodata .rodata.*)
607610
*libzephyr.a:i2c_hal_iram.*(.rodata .rodata.*)
608611
*libzephyr.a:wdt_hal_iram.*(.rodata .rodata.*)
@@ -634,6 +637,7 @@ SECTIONS
634637
*libzephyr.a:spi_flash_wrap.*(.rodata .rodata.*)
635638
*libzephyr.a:spi_flash_hpm_enable.*(.rodata .rodata.*)
636639
*libzephyr.a:spi_flash_oct_flash_init.*(.rodata .rodata.*)
640+
*libzephyr.a:flash_ops.*(.rodata .rodata.* .sdata2 .sdata2.* .srodata .srodata.*)
637641
*libzephyr.a:flash_qio_mode.*(.rodata .rodata.*)
638642

639643
/* [mapping:esp_mm] */
@@ -833,8 +837,8 @@ SECTIONS
833837
__rom_region_start = ABSOLUTE(.);
834838

835839
#if !defined(CONFIG_ESP32_WIFI_IRAM_OPT)
836-
*libnet80211.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.*)
837-
*libpp.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiorslpiram .wifiorslpiram.*)
840+
*libnet80211.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiextrairam .wifiextrairam.*)
841+
*libpp.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiorslpiram .wifiorslpiram.* .wifiextrairam .wifiextrairam.*)
838842

839843
#endif
840844

soc/espressif/esp32s2/mcuboot.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ SECTIONS
5454
*libzephyr.a:cbprintf_nano.*(.literal .text .literal.* .text.*)
5555
*libzephyr.a:cpu.*(.literal .text .literal.* .text.*)
5656
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
57-
*libzephyr.a:cache_hal.*(.literal .text .literal.* .text.*)
5857
*libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
5958
*libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
6059
*libzephyr.a:heap.*(.literal .text .literal.* .text.*)
@@ -68,8 +67,6 @@ SECTIONS
6867
*libzephyr.a:rtc_clk.*(.literal .literal.* .text .text.*)
6968
*libzephyr.a:rtc_clk_init.*(.literal .literal.* .text .text.*)
7069

71-
*(.literal.bootloader_mmap .text.bootloader_mmap)
72-
*(.literal.bootloader_munmap .text.bootloader_munmap)
7370
*(.literal.esp_intr_disable .literal.esp_intr_disable.* .text.esp_intr_disable .text.esp_intr_disable.*)
7471
*(.literal.default_intr_handler .text.default_intr_handler .iram1.*.default_intr_handler)
7572
*(.literal.esp_log_timestamp .text.esp_log_timestamp)

0 commit comments

Comments
 (0)