alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-07 17:08:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/ldgen_mapping_extensions' into 'master'

Browse Source 
ldgen: mapping flags extensions

Closes IDFGH-2524

See merge request espressif/esp-idf!12035
This commit is contained in:
Angus Gratton
2021-03-09 22:43:08 +00:00
parent 2c511e0295 10c5226095
commit 39a2d531f0
24 changed files with 1545 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
components/esp32/ld/esp32.project.ld.in
View File

@@ -37,9 +37,7 @@ SECTIONS
. = ALIGN(4);
_rtc_force_fast_start = ABSOLUTE(.);
_coredump_rtc_fast_start = ABSOLUTE(.);
mapping[rtc_fast_coredump]
_coredump_rtc_fast_end = ABSOLUTE(.);
mapping[rtc_force_fast]
*(.rtc.force_fast .rtc.force_fast.*)
. = ALIGN(4) ;
@@ -58,12 +56,6 @@ SECTIONS
{
_rtc_data_start = ABSOLUTE(.);
/* coredump mapping */
_coredump_rtc_start = ABSOLUTE(.);
mapping[rtc_coredump]
_coredump_rtc_end = ABSOLUTE(.);
/* should be placed after coredump mapping */
mapping[rtc_data]
*rtc_wake_stub*.*(.data .rodata .data.* .rodata.* .bss .bss.*)
@@ -180,18 +172,6 @@ SECTIONS
.dram0.data :
{
_data_start = ABSOLUTE(.);
_bt_data_start = ABSOLUTE(.);
*libbt.a:(.data .data.*)
. = ALIGN (4);
_bt_data_end = ABSOLUTE(.);
_btdm_data_start = ABSOLUTE(.);
*libbtdm_app.a:(.data .data.*)
. = ALIGN (4);
_btdm_data_end = ABSOLUTE(.);
_nimble_data_start = ABSOLUTE(.);
*libnimble.a:(.data .data.*)
. = ALIGN (4);
_nimble_data_end = ABSOLUTE(.);
*(.gnu.linkonce.d.*)
*(.data1)
*(.sdata)
@@ -202,12 +182,6 @@ SECTIONS
*(.gnu.linkonce.s2.*)
*(.jcr)
/* coredump mapping */
_coredump_dram_start = ABSOLUTE(.);
mapping[dram_coredump]
_coredump_dram_end = ABSOLUTE(.);
/* should be placed after coredump mapping */
_esp_system_init_fn_array_start = ABSOLUTE(.);
KEEP (*(SORT(.esp_system_init_fn) SORT(.esp_system_init_fn.*)))
_esp_system_init_fn_array_end = ABSOLUTE(.);
@@ -248,18 +222,6 @@ SECTIONS
{
. = ALIGN (8);
_bss_start = ABSOLUTE(.);
_bt_bss_start = ABSOLUTE(.);
*libbt.a:(.bss .bss.* COMMON)
. = ALIGN (4);
_bt_bss_end = ABSOLUTE(.);
_btdm_bss_start = ABSOLUTE(.);
*libbtdm_app.a:(.bss .bss.* COMMON)
. = ALIGN (4);
_btdm_bss_end = ABSOLUTE(.);
_nimble_bss_start = ABSOLUTE(.);
*libnimble.a:(.bss .bss.* COMMON)
. = ALIGN (4);
_nimble_bss_end = ABSOLUTE(.);
mapping[dram0_bss]
@@ -369,12 +331,6 @@ SECTIONS
. = ALIGN(4);
_iram_data_start = ABSOLUTE(.);
/* coredump mapping */
_coredump_iram_start = ABSOLUTE(.);
mapping[iram_coredump]
_coredump_iram_end = ABSOLUTE(.);
/* should be placed after coredump mapping */
mapping[iram0_data]
_iram_data_end = ABSOLUTE(.);

80
components/esp32/ld/esp32_fragments.lf
View File

@@ -48,22 +48,6 @@ entries:
entries:
.rtc.bss
[sections:rtc_fast_coredump]
entries:
.rtc.fast.coredump+
[sections:rtc_coredump]
entries:
.rtc.coredump+
[sections:dram_coredump]
entries:
.dram1.coredump+
[sections:iram_coredump]
entries:
.iram.data.coredump+
[sections:iram]
entries:
.iram1+
@@ -84,30 +68,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 +92,6 @@ 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,31 +114,7 @@ entries:
entries:
text -> iram0_text
[scheme:wifi_iram]
[mapping:default]
archive: *
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
* (default)