Be more careful when initing the board outside the VM.

tannewt · tannewt · commit 37e10d4a812a · 2019-03-12T11:18:29.000-07:00
diff --git a/ports/atmel-samd/common-hal/busio/SPI.c b/ports/atmel-samd/common-hal/busio/SPI.c
@@ -89,14 +89,16 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     Sercom* sercom = NULL;
     uint8_t sercom_index;
     uint32_t clock_pinmux = 0;
-    bool mosi_none = mosi == mp_const_none;
-    bool miso_none = miso == mp_const_none;
+    bool mosi_none = mosi == mp_const_none || mosi == NULL;
+    bool miso_none = miso == mp_const_none || miso == NULL;
     uint32_t mosi_pinmux = 0;
     uint32_t miso_pinmux = 0;
     uint8_t clock_pad = 0;
     uint8_t mosi_pad = 0;
     uint8_t miso_pad = 0;
     uint8_t dopo = 255;
+
+    // Special case for SAMR boards.
     #ifdef PIN_PC19
     if (miso == &pin_PC19) {
         if (mosi == &pin_PB30 && clock == &pin_PC18) {
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
@@ -171,6 +171,9 @@ safe_mode_t port_init(void) {
 
     init_shared_dma();
 
+    // Reset everything into a known state before board_init.
+    reset_port();
+
     // Init the board last so everything else is ready
     board_init();
 
