Ver Fonte

Bluetooth: fix BSS placement in the linker script generated by ldgen

Omar Chebib há 3 anos atrás
pai
commit
950981906b
1 ficheiros alterados com 17 adições e 9 exclusões
  1. 17 9
      components/bt/linker.lf

+ 17 - 9
components/bt/linker.lf

@@ -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)