Merge pull request arduino#87 from bcmi-labs/heap-limit

Fix __HeapLimit address
cristidragomir97 · Jun 15, 2023 · da5a1f2 · da5a1f2
2 parents 372ba12 + 0fa7dff
commit da5a1f2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/variants/MINIMA/fsp.ld b/variants/MINIMA/fsp.ld
@@ -242,7 +242,6 @@ SECTIONS
         __HeapBase = .;
         end = .;
         KEEP(*(.heap))
-        __HeapLimit = .;
     } > RAM
 
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM) - VECTOR_TABLE_LENGTH;
@@ -253,6 +252,8 @@ SECTIONS
 	.stack_dummy ABSOLUTE(__StackTop - BSP_CFG_STACK_MAIN_BYTES) (NOLOAD):
 	{
         . = ALIGN(8);
+        __HeapLimit = .;
+        __StackLimit = .;
         KEEP(*(.stack))
 		KEEP(*(.stack*))
         __StackTopAll = .;
@@ -265,7 +266,6 @@ SECTIONS
         . = ABSOLUTE(RAM_START + RAM_LENGTH);
     } > RAM
 
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
 	PROVIDE(__stack = __StackTop);
 
     .ns_buffer (NOLOAD):

diff --git a/variants/MUXTO/fsp.ld b/variants/MUXTO/fsp.ld
@@ -242,7 +242,6 @@ SECTIONS
         __HeapBase = .;
         end = .;
         KEEP(*(.heap))
-        __HeapLimit = .;
     } > RAM
 
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM) - VECTOR_TABLE_LENGTH;
@@ -253,6 +252,8 @@ SECTIONS
 	.stack_dummy ABSOLUTE(__StackTop - BSP_CFG_STACK_MAIN_BYTES) (NOLOAD):
 	{
         . = ALIGN(8);
+        __HeapLimit = .;
+        __StackLimit = .;
         KEEP(*(.stack))
 		KEEP(*(.stack*))
         __StackTopAll = .;
@@ -265,7 +266,6 @@ SECTIONS
         . = ABSOLUTE(RAM_START + RAM_LENGTH);
     } > RAM
 
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
 	PROVIDE(__stack = __StackTop);
 
     .ns_buffer (NOLOAD):

diff --git a/variants/PORTENTA_C33/fsp.ld b/variants/PORTENTA_C33/fsp.ld
@@ -449,7 +449,6 @@ SECTIONS
         __HeapBase = .;
         end = .;
         KEEP(*(.heap))
-        __HeapLimit = .;
     } > RAM
 
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM) - VECTOR_TABLE_LENGTH;
@@ -460,6 +459,7 @@ SECTIONS
 	.stack_dummy ABSOLUTE(__StackTop - BSP_CFG_STACK_MAIN_BYTES) (NOLOAD):
     {
         . = ALIGN(8);
+        __HeapLimit = .;
         __StackLimit = .;
         KEEP(*(.stack))
         KEEP(*(.stack*))

diff --git a/variants/UNOWIFIR4/fsp.ld b/variants/UNOWIFIR4/fsp.ld
@@ -242,7 +242,6 @@ SECTIONS
         __HeapBase = .;
         end = .;
         KEEP(*(.heap))
-        __HeapLimit = .;
     } > RAM
 
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM) - VECTOR_TABLE_LENGTH;
@@ -253,6 +252,8 @@ SECTIONS
 	.stack_dummy ABSOLUTE(__StackTop - BSP_CFG_STACK_MAIN_BYTES) (NOLOAD):
 	{
         . = ALIGN(8);
+        __HeapLimit = .;
+        __StackLimit = .;
         KEEP(*(.stack))
 		KEEP(*(.stack*))
         __StackTopAll = .;
@@ -265,7 +266,6 @@ SECTIONS
         . = ABSOLUTE(RAM_START + RAM_LENGTH);
     } > RAM
 
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
 	PROVIDE(__stack = __StackTop);
 
     .ns_buffer (NOLOAD):