merge from upstream

1 files changed, 3 insertions, 2 deletions

diff --git a/main.c b/main.c
index 392f96f30..5b719dc4b 100755
--- a/main.c
+++ b/main.c
@@ -444,11 +444,12 @@ int run_repl(void) {
 }
 
 int __attribute__((used)) main(void) {
-    memory_init();
-
     // initialise the cpu and peripherals
     safe_mode_t safe_mode = port_init();
 
+    // Init memory after the port in case the port needs to set aside memory.
+    memory_init();
+
     // Turn on LEDs
     init_status_leds();
     rgb_led_status_init();