diff --git a/ports/mimxrt10xx/boards/teensy40/board.c b/ports/mimxrt10xx/boards/teensy40/board.c
index a16e901037..28786ab902 100644
--- a/ports/mimxrt10xx/boards/teensy40/board.c
+++ b/ports/mimxrt10xx/boards/teensy40/board.c
@@ -30,11 +30,6 @@
 #include "shared-bindings/microcontroller/Pin.h"
 
 void board_init(void) {
-    // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);//SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);//SWCLK
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);//SWO
-
     // FLEX flash
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
@@ -43,9 +38,16 @@ void board_init(void) {
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
     common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
 
-    // USB Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_01);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_03);
+    // FLEX flash 2
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_08);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_09);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);
+    common_hal_never_reset_pin(&pin_GPIO_EMC_01);
+    common_hal_never_reset_pin(&pin_GPIO_B0_13);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_11);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/mimxrt10xx/boards/teensy41/board.c b/ports/mimxrt10xx/boards/teensy41/board.c
index 52dd498b3f..28786ab902 100644
--- a/ports/mimxrt10xx/boards/teensy41/board.c
+++ b/ports/mimxrt10xx/boards/teensy41/board.c
@@ -27,8 +27,27 @@
 
 #include "boards/board.h"
 #include "mpconfigboard.h"
+#include "shared-bindings/microcontroller/Pin.h"
 
 void board_init(void) {
+    // FLEX flash
+    common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
+    common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
+    common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
+    common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
+    common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
+    common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
+
+    // FLEX flash 2
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_08);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_09);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);
+    common_hal_never_reset_pin(&pin_GPIO_EMC_01);
+    common_hal_never_reset_pin(&pin_GPIO_B0_13);
+    common_hal_never_reset_pin(&pin_GPIO_AD_B0_11);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index ed5824732d..3ac66fd2a6 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -306,7 +306,10 @@ void reset_port(void) {
 
     //reset_event_system();
 
+    // TODO: implement a proper fix for 1060 resets
+    #if !defined (MIMXRT1062_SERIES)
     reset_all_pins();
+    #endif
 }
 
 void reset_to_bootloader(void) {