diff --git a/components/esp32/ld/esp32_fragments.lf b/components/esp32/ld/esp32_fragments.lf index 4502f218b0..b4e1570f91 100644 --- a/components/esp32/ld/esp32_fragments.lf +++ b/components/esp32/ld/esp32_fragments.lf @@ -84,30 +84,6 @@ entries: entries: .dram1+ -[sections:wifi_iram] -entries: - .wifi0iram+ - -[sections:wifi_rx_iram] -entries: - .wifirxiram+ - -[sections:phy_iram] -entries: - .phyiram+ - -[sections:wifi_slp_iram] -entries: - .wifislpiram+ - -[sections:wifi_or_slp_iram] -entries: - .wifiorslpiram+ - -[sections:wifi_slp_rx_iram] -entries: - .wifislprxiram+ - [scheme:default] entries: if APP_BUILD_USE_FLASH_SECTIONS = y: @@ -132,16 +108,10 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - wifi_iram -> flash_text - wifi_rx_iram -> flash_text - phy_iram -> flash_text dram_coredump -> dram_coredump iram_coredump -> iram_coredump rtc_coredump -> rtc_coredump rtc_fast_coredump -> rtc_fast_coredump - wifi_slp_iram -> flash_text - wifi_or_slp_iram -> flash_text - wifi_slp_rx_iram -> flash_text [scheme:rtc] entries: @@ -164,35 +134,6 @@ entries: entries: text -> iram0_text -[scheme:wifi_iram] -entries: - wifi_iram -> iram0_text - -[scheme:wifi_rx_iram] -entries: - wifi_rx_iram -> iram0_text - -[scheme:phy_iram] -entries: - phy_iram -> iram0_text - -[scheme:extram_bss] -entries: - bss -> extern_ram - common -> extern_ram - -[scheme:wifi_slp_iram] -entries: - wifi_slp_iram -> iram0_text - -[scheme:wifi_or_slp_iram] -entries: - wifi_or_slp_iram -> iram0_text - -[scheme:wifi_slp_rx_iram] -entries: - wifi_slp_rx_iram -> iram0_text - [mapping:default] archive: * entries: diff --git a/components/esp32c3/ld/esp32c3_fragments.lf b/components/esp32c3/ld/esp32c3_fragments.lf index 9e16b024e2..c00feb474d 100644 --- a/components/esp32c3/ld/esp32c3_fragments.lf +++ b/components/esp32c3/ld/esp32c3_fragments.lf @@ -68,26 +68,6 @@ entries: entries: .dram1+ -[sections:wifi_iram] -entries: - .wifi0iram+ - -[sections:wifi_rx_iram] -entries: - .wifirxiram+ - -[sections:wifi_slp_iram] -entries: - .wifislpiram+ - -[sections:wifi_or_slp_iram] -entries: - .wifiorslpiram+ - -[sections:wifi_slp_rx_iram] -entries: - .wifislprxiram+ - [scheme:default] entries: if APP_BUILD_USE_FLASH_SECTIONS = y: @@ -107,15 +87,10 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - wifi_iram -> flash_text - wifi_rx_iram -> flash_text dram_coredump -> dram_coredump iram_coredump -> iram_coredump rtc_coredump -> rtc_coredump rtc_fast_coredump -> rtc_fast_coredump - wifi_slp_iram -> flash_text - wifi_or_slp_iram -> flash_text - wifi_slp_rx_iram -> flash_text [scheme:rtc] entries: @@ -138,26 +113,6 @@ entries: entries: text -> iram0_text -[scheme:wifi_iram] -entries: - wifi_iram -> iram0_text - -[scheme:wifi_rx_iram] -entries: - wifi_rx_iram -> iram0_text - -[scheme:wifi_slp_iram] -entries: - wifi_slp_iram -> iram0_text - -[scheme:wifi_or_slp_iram] -entries: - wifi_or_slp_iram -> iram0_text - -[scheme:wifi_slp_rx_iram] -entries: - wifi_slp_rx_iram -> iram0_text - [mapping:default] archive: * entries: diff --git a/components/esp32s2/ld/esp32s2_fragments.lf b/components/esp32s2/ld/esp32s2_fragments.lf index a04ed2d1a2..bbd338305a 100644 --- a/components/esp32s2/ld/esp32s2_fragments.lf +++ b/components/esp32s2/ld/esp32s2_fragments.lf @@ -56,26 +56,6 @@ entries: entries: .dram1+ -[sections:wifi_iram] -entries: - .wifi0iram+ - -[sections:wifi_rx_iram] -entries: - .wifirxiram+ - -[sections:wifi_slp_iram] -entries: - .wifislpiram+ - -[sections:wifi_or_slp_iram] -entries: - .wifiorslpiram+ - -[sections:wifi_slp_rx_iram] -entries: - .wifislprxiram+ - [scheme:default] entries: if APP_BUILD_USE_FLASH_SECTIONS = y: @@ -93,14 +73,9 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - wifi_iram -> flash_text - wifi_rx_iram -> flash_text dram_coredump -> dram_coredump rtc_coredump -> rtc_coredump rtc_fast_coredump -> rtc_fast_coredump - wifi_slp_iram -> flash_text - wifi_or_slp_iram -> flash_text - wifi_slp_rx_iram -> flash_text [scheme:rtc] entries: @@ -123,26 +98,6 @@ entries: entries: text -> iram0_text -[scheme:wifi_iram] -entries: - wifi_iram -> iram0_text - -[scheme:wifi_rx_iram] -entries: - wifi_rx_iram -> iram0_text - -[scheme:wifi_slp_iram] -entries: - wifi_slp_iram -> iram0_text - -[scheme:wifi_or_slp_iram] -entries: - wifi_or_slp_iram -> iram0_text - -[scheme:wifi_slp_rx_iram] -entries: - wifi_slp_rx_iram -> iram0_text - [mapping:default] archive: * entries: diff --git a/components/esp32s3/ld/esp32s3_fragments.lf b/components/esp32s3/ld/esp32s3_fragments.lf index 9e16b024e2..c00feb474d 100644 --- a/components/esp32s3/ld/esp32s3_fragments.lf +++ b/components/esp32s3/ld/esp32s3_fragments.lf @@ -68,26 +68,6 @@ entries: entries: .dram1+ -[sections:wifi_iram] -entries: - .wifi0iram+ - -[sections:wifi_rx_iram] -entries: - .wifirxiram+ - -[sections:wifi_slp_iram] -entries: - .wifislpiram+ - -[sections:wifi_or_slp_iram] -entries: - .wifiorslpiram+ - -[sections:wifi_slp_rx_iram] -entries: - .wifislprxiram+ - [scheme:default] entries: if APP_BUILD_USE_FLASH_SECTIONS = y: @@ -107,15 +87,10 @@ entries: rtc_data -> rtc_data rtc_rodata -> rtc_data rtc_bss -> rtc_bss - wifi_iram -> flash_text - wifi_rx_iram -> flash_text dram_coredump -> dram_coredump iram_coredump -> iram_coredump rtc_coredump -> rtc_coredump rtc_fast_coredump -> rtc_fast_coredump - wifi_slp_iram -> flash_text - wifi_or_slp_iram -> flash_text - wifi_slp_rx_iram -> flash_text [scheme:rtc] entries: @@ -138,26 +113,6 @@ entries: entries: text -> iram0_text -[scheme:wifi_iram] -entries: - wifi_iram -> iram0_text - -[scheme:wifi_rx_iram] -entries: - wifi_rx_iram -> iram0_text - -[scheme:wifi_slp_iram] -entries: - wifi_slp_iram -> iram0_text - -[scheme:wifi_or_slp_iram] -entries: - wifi_or_slp_iram -> iram0_text - -[scheme:wifi_slp_rx_iram] -entries: - wifi_slp_rx_iram -> iram0_text - [mapping:default] archive: * entries: diff --git a/components/esp_wifi/linker.lf b/components/esp_wifi/linker.lf index d955938bce..05444cbcd1 100644 --- a/components/esp_wifi/linker.lf +++ b/components/esp_wifi/linker.lf @@ -1,3 +1,72 @@ +[sections:wifi_iram] +entries: + .wifi0iram+ + +[sections:wifi_rx_iram] +entries: + .wifirxiram+ + +[sections:wifi_slp_iram] +entries: + .wifislpiram+ + +[sections:wifi_or_slp_iram] +entries: + .wifiorslpiram+ + +[sections:wifi_slp_rx_iram] +entries: + .wifislprxiram+ + +[scheme:wifi_iram] +entries: + wifi_iram -> iram0_text + +[scheme:wifi_rx_iram] +entries: + wifi_rx_iram -> iram0_text + +[scheme:extram_bss] +entries: + bss -> extern_ram + common -> extern_ram + +[scheme:wifi_slp_iram] +entries: + wifi_slp_iram -> iram0_text + +[scheme:wifi_or_slp_iram] +entries: + wifi_or_slp_iram -> iram0_text + +[scheme:wifi_slp_rx_iram] +entries: + wifi_slp_rx_iram -> iram0_text + +if IDF_TARGET_ESP32 = y: + [scheme:phy_iram] + entries: + phy_iram -> iram0_text + + [sections:phy_iram] + entries: + .phyiram+ + +[scheme:wifi_default] +entries: + wifi_slp_iram -> flash_text + wifi_or_slp_iram -> flash_text + wifi_slp_rx_iram -> flash_text + wifi_iram -> flash_text + wifi_rx_iram -> flash_text + if IDF_TARGET_ESP32 = y: + phy_iram -> flash_text + +[mapping:wifi_default] +archive: * +entries: + * (wifi_default) + [mapping:phy] archive: libphy.a entries: