Skip to content

Commit be9574e

Browse files
sylvioalvesmmahadevan108
authored andcommitted
soc: esp32c3: 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 412921b commit be9574e

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

soc/espressif/esp32c3/default.ld

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ SECTIONS
238238
*libkernel.a:(.literal .text .literal.* .text.*)
239239
*libgcc.a:lib2funcs.*(.literal .text .literal.* .text.*)
240240
*libdrivers__flash.a:flash_esp32.*(.literal .text .literal.* .text.*)
241-
*libzephyr.a:spi_flash_rom_patch.*(.literal .text .literal.* .text.*)
242241
*libzephyr.a:log_noos.*(.literal .text .literal.* .text.*)
243242
*libdrivers__timer.a:esp32c3_sys_timer.*(.literal .text .literal.* .text.*)
244243
*libzephyr.a:log_core.*(.literal .text .literal.* .text.*)
@@ -293,7 +292,7 @@ SECTIONS
293292
*libzephyr.a:flash_brownout_hook.*(.literal .literal.* .text .text.*)
294293
*libzephyr.a:spi_flash_wrap.*(.literal .literal.* .text .text.*)
295294
*libzephyr.a:spi_flash_hpm_enable.*(.literal .literal.* .text .text.*)
296-
*libzephyr.a:spi_flash_oct_flash_init*(.literal .literal.* .text .text.*)
295+
*libzephyr.a:flash_ops.*(.literal .text .literal.* .text.*)
297296

298297
/* [mapping:esp_system] */
299298
*libzephyr.a:esp_err.*(.literal .literal.* .text .text.*)
@@ -336,8 +335,8 @@ SECTIONS
336335
*libzephyr.a:bootloader_random*.*(.literal.bootloader_random_enable .text.bootloader_random_enable)
337336

338337
#if defined(CONFIG_ESP32_WIFI_IRAM_OPT)
339-
*libnet80211.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.*)
340-
*libpp.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.*)
338+
*libnet80211.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiextrairam .wifiextrairam.*)
339+
*libpp.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiextrairam .wifiextrairam.*)
341340
*libcoexist.a:(.wifi_slp_iram .wifi_slp_iram.*)
342341

343342
/* [mapping:esp_wifi] */
@@ -381,8 +380,6 @@ SECTIONS
381380
*libzephyr.a:bootloader_console.*(.literal .text .literal.* .text.*)
382381

383382
*libzephyr.a:esp_image_format.*(.literal .text .literal.* .text.*)
384-
*libzephyr.a:flash_ops.*(.literal .text .literal.* .text.*)
385-
*libzephyr.a:flash_ops_esp32c3.*(.literal .text .literal.* .text.*)
386383
*libzephyr.a:flash_encrypt.*(.literal .text .literal.* .text.*)
387384
*libzephyr.a:flash_encryption_secure_features.*(.literal .text .literal.* .text.*)
388385
*libzephyr.a:flash_partitions.*(.literal .text .literal.* .text.*)
@@ -481,7 +478,6 @@ SECTIONS
481478
*libzephyr.a:log_output.*(.rodata .rodata.* .srodata .srodata.*)
482479
*libdrivers__flash.a:flash_esp32.*(.rodata .rodata.* .srodata .srodata.*)
483480
*libdrivers__serial.a:uart_esp32.*(.rodata .rodata.* .srodata .srodata.*)
484-
*libzephyr.a:spi_flash_rom_patch.*(.rodata .rodata.* .srodata .srodata.*)
485481
*libzephyr.a:periph_ctrl.*(.rodata .rodata.* .srodata .srodata.*)
486482
*libzephyr.a:loader.*(.rodata .rodata.* .srodata .srodata.*)
487483
*libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)
@@ -521,7 +517,7 @@ SECTIONS
521517
*libzephyr.a:flash_brownout_hook.*(.rodata .rodata.* .srodata .srodata.*)
522518
*libzephyr.a:spi_flash_wrap.*(.rodata .rodata.* .srodata .srodata.*)
523519
*libzephyr.a:spi_flash_hpm_enable.*(.rodata .rodata.* .srodata .srodata.*)
524-
*libzephyr.a:spi_flash_oct_flash_init.*(.rodata .rodata.* .srodata .srodata.*)
520+
*libzephyr.a:flash_ops.*(.rodata .rodata.* .srodata .srodata.*)
525521
*libzephyr.a:flash_qio_mode.*(.rodata .rodata.* .srodata .srodata.*)
526522

527523
/* [mapping:esp_mm] */
@@ -580,7 +576,6 @@ SECTIONS
580576
*libzephyr.a:esp_clk.*(.rodata .rodata.* .srodata .srodata.*)
581577
*libzephyr.a:flash_mmap.*(.rodata .rodata.* .srodata .srodata.*)
582578
*libzephyr.a:flash_ops.*(.rodata .rodata.* .srodata .srodata.*)
583-
*libzephyr.a:flash_ops_esp32c3.*(.rodata .rodata.* .srodata .srodata.*)
584579

585580
*libzephyr.a:esp_gpio_reserve.*(.rodata .rodata.* .srodata .srodata.*)
586581
*libzephyr.a:spi_flash_hal.*(.rodata .rodata.* .srodata .srodata.*)
@@ -682,8 +677,8 @@ SECTIONS
682677
__rom_region_start = ABSOLUTE(.);
683678

684679
#if !defined(CONFIG_ESP32_WIFI_IRAM_OPT)
685-
*libnet80211.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.*)
686-
*libpp.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.*)
680+
*libnet80211.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiextrairam .wifiextrairam.*)
681+
*libpp.a:( .wifi0iram .wifi0iram.* .wifislpiram .wifislpiram.* .wifiextrairam .wifiextrairam.*)
687682
#endif /* CONFIG_ESP32_WIFI_IRAM_OPT */
688683

689684
#if !defined(CONFIG_ESP32_WIFI_RX_IRAM_OPT)

soc/espressif/esp32c3/mcuboot.ld

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ SECTIONS
5050
*libzephyr.a:cbprintf_nano.*(.literal .text .literal.* .text.*)
5151
*libzephyr.a:cpu.*(.literal .text .literal.* .text.*)
5252
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
53-
*libzephyr.a:cache_hal.*(.literal .text .literal.* .text.*)
5453
*libzephyr.a:flash_map.*(.literal .text .literal.* .text.*)
5554
*libzephyr.a:esp_rom_spiflash.*(.literal .text .literal.* .text.*)
5655

@@ -59,9 +58,6 @@ SECTIONS
5958
*libkernel.a:kheap.*(.literal .text .literal.* .text.*)
6059
*libkernel.a:mempool.*(.literal .text .literal.* .text.*)
6160

62-
*(.literal.bootloader_mmap .text.bootloader_mmap)
63-
*(.literal.bootloader_munmap .text.bootloader_munmap)
64-
6561
*libzephyr.a:esp_loader.*(.literal .text .literal.* .text.*)
6662
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
6763

0 commit comments

Comments
 (0)