armcm_boot: Use armcm_main() instead of main() to start board code

The main() function has a special meaning to gcc and using it can
result in different code generation.  Use armcm_main() to avoid that.

Also, invoke SystemInit() from the board specific armcm_main() code.
This gives the board code more control over board initialization.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/atsam/main.c b/src/atsam/main.c
index 580ad770..843b5034 100644
--- a/src/atsam/main.c
+++ b/src/atsam/main.c
@@ -4,6 +4,7 @@
 //
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
+#include "board/armcm_boot.h" // armcm_main
 #include "board/irq.h" // irq_disable
 #include "board/usb_cdc.h" // usb_request_bootloader
 #include "command.h" // DECL_COMMAND_FLAGS
@@ -110,11 +111,11 @@ matrix_init(void)
                               | MATRIX_SCFG_DEFMSTR_TYPE(1));
 }
 
-// Main entry point
-int
-main(void)
+// Main entry point - called from armcm_boot.c:ResetHandler()
+void
+armcm_main(void)
 {
+    SystemInit();
     matrix_init();
     sched_main();
-    return 0;
 }