Merge branch 'master' of https://github.com/sparkfun/Arduino_Apollo3

Nathan Seidle · Nathan Seidle · commit a93dc390158a · 2019-06-19T12:00:16.000-06:00
diff --git a/cores/arduino/ard_sup/main.cpp b/cores/arduino/ard_sup/main.cpp
@@ -12,10 +12,7 @@ extern "C" void _init(void)
 {
   // Empty definition to resolve linker error within '__libc_init_array'
 }
-extern "C" void end(void)
-{
-  // Empty definition to satisfy linker error in '_sbrk'
-}
+void *__dso_handle; // providing the __dso_handle symbol manually. Todo: more research for the *correct* solution
 
 extern "C" int main(void)
 {
diff --git a/variants/SparkFun_Artemis/linker_scripts/gcc/ambiq_sbl_app.ld b/variants/SparkFun_Artemis/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -66,5 +66,13 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_Artemis/linker_scripts/gcc/artemis_sbl_svl_app.ld b/variants/SparkFun_Artemis/linker_scripts/gcc/artemis_sbl_svl_app.ld
@@ -66,5 +66,15 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
+    /* TODO: Collision Checking (at link time) */
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_BlackBoard_Artemis/linker_scripts/gcc/ambiq_sbl_app.ld b/variants/SparkFun_BlackBoard_Artemis/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -66,5 +66,13 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_BlackBoard_Artemis/linker_scripts/gcc/artemis_sbl_svl_app.ld b/variants/SparkFun_BlackBoard_Artemis/linker_scripts/gcc/artemis_sbl_svl_app.ld
@@ -66,5 +66,15 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
+    /* TODO: Collision Checking (at link time) */
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_BlackBoard_Artemis_Mega/linker_scripts/gcc/ambiq_sbl_app.ld b/variants/SparkFun_BlackBoard_Artemis_Mega/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -66,5 +66,13 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_BlackBoard_Artemis_Mega/linker_scripts/gcc/artemis_sbl_svl_app.ld b/variants/SparkFun_BlackBoard_Artemis_Mega/linker_scripts/gcc/artemis_sbl_svl_app.ld
@@ -66,5 +66,15 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
+    /* TODO: Collision Checking (at link time) */
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_BlackBoard_Artemis_Nano/linker_scripts/gcc/ambiq_sbl_app.ld b/variants/SparkFun_BlackBoard_Artemis_Nano/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -66,5 +66,13 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_BlackBoard_Artemis_Nano/linker_scripts/gcc/artemis_sbl_svl_app.ld b/variants/SparkFun_BlackBoard_Artemis_Nano/linker_scripts/gcc/artemis_sbl_svl_app.ld
@@ -66,5 +66,15 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
+    /* TODO: Collision Checking (at link time) */
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_Edge/linker_scripts/gcc/ambiq_sbl_app.ld b/variants/SparkFun_Edge/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -66,5 +66,13 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_Edge/linker_scripts/gcc/artemis_sbl_svl_app.ld b/variants/SparkFun_Edge/linker_scripts/gcc/artemis_sbl_svl_app.ld
@@ -0,0 +1,80 @@
+/******************************************************************************
+ *
+ * blank_slate.ld - Linker script for applications using startup_gnu.c
+ *
+ *****************************************************************************/
+ENTRY(Reset_Handler)
+
+MEMORY
+{
+    FLASH (rx) : ORIGIN = 0x00010000, LENGTH = 960K /*Modified from 0xC000 to work with SparkFun ABL*/
+    SRAM (rwx) : ORIGIN = 0x10000000, LENGTH = 384K
+}
+
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        KEEP(*(.isr_vector))
+        KEEP(*(.patch))
+        *(.text)
+        *(.text*)
+
+        . = ALIGN(4);  
+        __init_array_start = .;
+        KEEP(*(.init_array))        /* C++ constructors */ 
+        KEEP(*(.ctors))             /* and vtable init */
+        __init_array_end = .; 
+
+        *(.rodata)
+        *(.rodata*)
+        . = ALIGN(4);
+        _etext = .;
+    } > FLASH
+
+    /* User stack section initialized by startup code. */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        *(.stack)
+        *(.stack*)
+        . = ALIGN(8);
+    } > SRAM
+
+    .data :
+    {
+        . = ALIGN(4);
+        _sdata = .;
+        *(.data)
+        *(.data*)
+        . = ALIGN(4);
+        _edata = .;
+    } > SRAM AT>FLASH
+
+    /* used by startup to initialize data */
+    _init_data = LOADADDR(.data);
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        *(.bss)
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = .;
+    } > SRAM
+
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
+    /* TODO: Collision Checking (at link time) */
+
+    .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/variants/SparkFun_Edge_V2/linker_scripts/gcc/ambiq_sbl_app.ld b/variants/SparkFun_Edge_V2/linker_scripts/gcc/ambiq_sbl_app.ld
@@ -66,5 +66,13 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/variants/SparkFun_Edge_V2/linker_scripts/gcc/artemis_sbl_svl_app.ld b/variants/SparkFun_Edge_V2/linker_scripts/gcc/artemis_sbl_svl_app.ld
@@ -66,5 +66,15 @@ SECTIONS
         _ebss = .;
     } > SRAM
 
+    .heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > SRAM
+
+    /* TODO: Collision Checking (at link time) */
+
     .ARM.attributes 0 : { *(.ARM.attributes) }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,7 @@ extern "C" void _init(void)`
`12`	`12`	`{`
`13`	`13`	`// Empty definition to resolve linker error within '__libc_init_array'`
`14`	`14`	`}`
`15`		`-extern "C" void end(void)`
`16`		`-{`
`17`		`- // Empty definition to satisfy linker error in '_sbrk'`
`18`		`-}`
	`15`	`+void __dso_handle; // providing the __dso_handle symbol manually. Todo: more research for the correct* solution`
`19`	`16`
`20`	`17`	`extern "C" int main(void)`
`21`	`18`	`{`