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

Merge branch 'bugfix/bt_bss_wrong_address_v4.4' into 'release/v4.4'

Browse Source 
Bluetooth: fix BSS placement in the linker script generated by ldgen (backport v4.4)

See merge request espressif/esp-idf!20978
This commit is contained in:
Zim Kalinowski
2022-11-11 12:14:51 +08:00
parent 2d9d9e52bf a4df6776b6
commit 2e1deb55c0
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
components/bt/linker.lf
View File

@@ -1,16 +1,21 @@
[sections:bss_common] [sections:bt_bss]
entries: entries:
.bss+ .bss+
[sections:bt_common]
entries:
COMMON COMMON
[scheme:bt_start_end] [scheme:bt_start_end]
entries: entries:
bss_common -> dram0_bss bt_bss -> dram0_bss
bt_common -> dram0_bss
data -> dram0_data data -> dram0_data
# For the following fragments, order matters for # For the following fragments, order matters for
# 'ALIGN(4, post) SURROUND(sym)', which generates: # 'ALIGN(4) ALIGN(4, post) SURROUND(sym)', which generates:
# #
# . = ALIGN(4)
# _sym_start # _sym_start
# ... # ...
# . = ALIGN(4) # . = ALIGN(4)
@@ -20,8 +25,9 @@ entries:
archive: libbt.a archive: libbt.a
entries: entries:
* (bt_start_end); * (bt_start_end);
bss_common -> dram0_bss ALIGN(4, post) SURROUND(bt_bss), bt_bss -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(bt_bss),
data -> dram0_data ALIGN(4, post) SURROUND(bt_data) bt_common -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(bt_common),
data -> dram0_data ALIGN(4) ALIGN(4, post) SURROUND(bt_data)
if ESP_ALLOW_BSS_SEG_EXTERNAL_MEMORY = y: if ESP_ALLOW_BSS_SEG_EXTERNAL_MEMORY = y:
* (extram_bss) * (extram_bss)
@@ -29,12 +35,14 @@ entries:
archive: libbtdm_app.a archive: libbtdm_app.a
entries: entries:
* (bt_start_end); * (bt_start_end);
bss_common -> dram0_bss ALIGN(4, post) SURROUND(btdm_bss), bt_bss -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(btdm_bss),
data -> dram0_data ALIGN(4, post) SURROUND(btdm_data) bt_common -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(btdm_common),
data -> dram0_data ALIGN(4) ALIGN(4, post) SURROUND(btdm_data)
[mapping:nimble] [mapping:nimble]
archive: libnimble.a archive: libnimble.a
entries: entries:
* (bt_start_end); * (bt_start_end);
bss_common -> dram0_bss ALIGN(4, post) SURROUND(nimble_bss), bt_bss -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(nimble_bss),
data -> dram0_data ALIGN(4, post) SURROUND(nimble_data) bt_common -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(nimble_common),
data -> dram0_data ALIGN(4) ALIGN(4, post) SURROUND(nimble_data)