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

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

See merge request espressif/esp-idf!20978
pull/10244/head
Zim Kalinowski 2022-11-11 12:14:51 +08:00
commit 2e1deb55c0
1 zmienionych plików z 17 dodań i 9 usunięć

Wyświetl plik

@ -1,16 +1,21 @@
[sections:bss_common]
[sections:bt_bss]
entries:
.bss+
[sections:bt_common]
entries:
COMMON
[scheme:bt_start_end]
entries:
bss_common -> dram0_bss
bt_bss -> dram0_bss
bt_common -> dram0_bss
data -> dram0_data
# 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
# ...
# . = ALIGN(4)
@ -20,8 +25,9 @@ entries:
archive: libbt.a
entries:
* (bt_start_end);
bss_common -> dram0_bss ALIGN(4, post) SURROUND(bt_bss),
data -> dram0_data ALIGN(4, post) SURROUND(bt_data)
bt_bss -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(bt_bss),
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:
* (extram_bss)
@ -29,12 +35,14 @@ entries:
archive: libbtdm_app.a
entries:
* (bt_start_end);
bss_common -> dram0_bss ALIGN(4, post) SURROUND(btdm_bss),
data -> dram0_data ALIGN(4, post) SURROUND(btdm_data)
bt_bss -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(btdm_bss),
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]
archive: libnimble.a
entries:
* (bt_start_end);
bss_common -> dram0_bss ALIGN(4, post) SURROUND(nimble_bss),
data -> dram0_data ALIGN(4, post) SURROUND(nimble_data)
bt_bss -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(nimble_bss),
bt_common -> dram0_bss ALIGN(4) ALIGN(4, post) SURROUND(nimble_common),
data -> dram0_data ALIGN(4) ALIGN(4, post) SURROUND(nimble_data)