Move board_init to main.c

hierophect · hierophect · commit 100409961aa3 · 2020-01-29T16:29:43.000-05:00
diff --git a/main.c b/main.c
@@ -57,6 +57,8 @@
 #include "supervisor/shared/stack.h"
 #include "supervisor/serial.h"
 
+#include "boards/board.h"
+
 #if CIRCUITPY_DISPLAYIO
 #include "shared-module/displayio/__init__.h"
 #endif
@@ -425,6 +427,9 @@ int __attribute__((used)) main(void) {
     // no SPI flash filesystem, and we might erase the existing one.
     filesystem_init(safe_mode == NO_SAFE_MODE, false);
 
+    // displays init after filesystem, since they could share the flash SPI
+    board_init(); 
+
     // Reset everything and prep MicroPython to run boot.py.
     reset_port();
     reset_board();
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
@@ -232,9 +232,6 @@ safe_mode_t port_init(void) {
     // Reset everything into a known state before board_init.
     reset_port();
 
-    // Init the board last so everything else is ready
-    board_init();
-
     #ifdef SAMD21
     if (PM->RCAUSE.bit.BOD33 == 1 || PM->RCAUSE.bit.BOD12 == 1) {
         return BROWNOUT;
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
@@ -76,9 +76,6 @@ safe_mode_t port_init(void) {
     // Reset everything into a known state before board_init.
     reset_port();
 
-    // Init the board last so everything else is ready
-    board_init();
-
     if (board_requests_safe_mode()) {
         return USER_SAFE_MODE;
     }
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
@@ -92,9 +92,6 @@ safe_mode_t port_init(void) {
     rtc_init();
     #endif
 
-    // Will do usb_init() if chip supports USB.
-    board_init();
-
     return NO_SAFE_MODE;
 }
 
diff --git a/ports/stm32f4/supervisor/port.c b/ports/stm32f4/supervisor/port.c
@@ -50,7 +50,6 @@ safe_mode_t port_init(void) {
     stm32f4_peripherals_gpio_init();
 
     tick_init();
-    board_init(); 
 
     return NO_SAFE_MODE;
 }

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,6 @@ safe_mode_t port_init(void) {`
`76`	`76`	`// Reset everything into a known state before board_init.`
`77`	`77`	`reset_port();`
`78`	`78`
`79`		`- // Init the board last so everything else is ready`
`80`		`- board_init();`
`81`		`-`
`82`	`79`	`if (board_requests_safe_mode()) {`
`83`	`80`	`return USER_SAFE_MODE;`
`84`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,6 @@ safe_mode_t port_init(void) {`
`92`	`92`	`rtc_init();`
`93`	`93`	`#endif`
`94`	`94`
`95`		`- // Will do usb_init() if chip supports USB.`
`96`		`- board_init();`
`97`		`-`
`98`	`95`	`return NO_SAFE_MODE;`
`99`	`96`	`}`
`100`	`97`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ safe_mode_t port_init(void) {`
`50`	`50`	`stm32f4_peripherals_gpio_init();`
`51`	`51`
`52`	`52`	`tick_init();`
`53`		`- board_init();`
`54`	`53`
`55`	`54`	`return NO_SAFE_MODE;`
`56`	`55`	`}`