2 files changed, 6 insertions, 8 deletions
diff --git a/src/generic/armcm_boot.c b/src/generic/armcm_boot.c
index ad7461ca..261fb912 100644
--- a/src/generic/armcm_boot.c
+++ b/src/generic/armcm_boot.c
@@ -6,8 +6,8 @@
 
 #include "armcm_boot.h" // DECL_ARMCM_IRQ
 #include "autoconf.h" // CONFIG_MCU
-#include "board/internal.h" // SystemInit
 #include "command.h" // DECL_CONSTANT_STR
+#include "misc.h" // dynmem_start
 
 // Export MCU type
 DECL_CONSTANT_STR("MCU", CONFIG_MCU);
@@ -37,14 +37,10 @@ ResetHandler(void)
     // Initializing the C library isn't needed...
     //__libc_init_array();
 
-    // Initialize the machine
-    SystemInit();
+    // Run the main board specific code
+    armcm_main();
 
-    // Run the main code
-    extern int main(void);
-    main();
-
-    // The main() call should not return
+    // The armcm_main() call should not return
     for (;;)
         ;
 }
diff --git a/src/generic/armcm_boot.h b/src/generic/armcm_boot.h
index a0bfd3f4..7bd982ce 100644
--- a/src/generic/armcm_boot.h
+++ b/src/generic/armcm_boot.h
@@ -3,6 +3,8 @@
 
 #include "ctr.h" // DECL_CTR_INT
 
+void armcm_main(void);
+
 // Declare an IRQ handler
 #define DECL_ARMCM_IRQ(FUNC, NUM)                                       \
     DECL_CTR_INT("DECL_ARMCM_IRQ " __stringify(FUNC), 1, CTR_INT(NUM))