Merge pull request #7345 from dhalbert/mimx-fix-build

redo pin never resetting for mimxrt10xx
adafruit · Dec 15, 2022 · c6ea3e8 · c6ea3e8
2 parents 493d6aa + b90a641
commit c6ea3e8
Show file tree

Hide file tree

Showing 12 changed files with 218 additions and 166 deletions.
diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/board.c b/ports/mimxrt10xx/boards/feather_m7_1011/board.c
@@ -26,21 +26,23 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-    // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12);// SWCLK
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    &pin_GPIO_AD_13,// SWDIO
+    &pin_GPIO_AD_12,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
-}
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
+    NULL,                       // Must end in NULL.
+};
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1011/board.c
@@ -26,23 +26,23 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-    // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12);// SWCLK
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    &pin_GPIO_AD_13,// SWDIO
+    &pin_GPIO_AD_12,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
-}
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
+    NULL,                       // Must end in NULL.
+};
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c b/ports/mimxrt10xx/boards/feather_mimxrt1062/board.c
@@ -26,22 +26,23 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);// SWCLK
+    &pin_GPIO_AD_B0_06,// SWDIO
+    &pin_GPIO_AD_B0_07,// SWCLK
 
     // 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);
-}
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
+    NULL,                       // Must end in NULL.
+};
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/board.c b/ports/mimxrt10xx/boards/imxrt1010_evk/board.c
@@ -26,25 +26,25 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
-    // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13); // SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12); // SWCLK
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    &pin_GPIO_AD_13, // SWDIO
+    &pin_GPIO_AD_12, // SWCLK
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
     // USB Pins
-    common_hal_never_reset_pin(&pin_GPIO_12);
-    common_hal_never_reset_pin(&pin_GPIO_13);
-}
+    &pin_GPIO_12,
+    &pin_GPIO_13,
+    NULL,                       // Must end in NULL.
+};
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/board.c b/ports/mimxrt10xx/boards/imxrt1020_evk/board.c
@@ -26,26 +26,27 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_00);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_01);// SWCLK
+    &pin_GPIO_AD_B0_00,// SWDIO
+    &pin_GPIO_AD_B0_01,// SWCLK
 
     // 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);
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &pin_GPIO_SD_B1_11,
 
     // USB Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B1_11);
-    common_hal_never_reset_pin(&pin_GPIO_AD_B1_12);
-}
+    &pin_GPIO_AD_B1_11,
+    &pin_GPIO_AD_B1_12,
+    NULL,                       // Must end in NULL.
+};
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/board.c b/ports/mimxrt10xx/boards/imxrt1060_evk/board.c
@@ -26,30 +26,33 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);// SWCLK
+    &pin_GPIO_AD_B0_06, // SWDIO
+    &pin_GPIO_AD_B0_07, // SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_00);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_01);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_02);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_03);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_04);
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
-    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);
+    &pin_GPIO_SD_B1_00,
+    &pin_GPIO_SD_B1_01,
+    &pin_GPIO_SD_B1_02,
+    &pin_GPIO_SD_B1_03,
+    &pin_GPIO_SD_B1_04,
+    &pin_GPIO_SD_B1_05,
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &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);
-}
+    &pin_GPIO_AD_B0_01,
+    &pin_GPIO_AD_B0_03,
+    NULL,                       // Must end in NULL.
+};
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/board.c b/ports/mimxrt10xx/boards/metro_m7_1011/board.c
@@ -26,23 +26,24 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // SWD Pins
-    common_hal_never_reset_pin(&pin_GPIO_AD_13);// SWDIO
-    common_hal_never_reset_pin(&pin_GPIO_AD_12);// SWCLK
+    &pin_GPIO_AD_13,// SWDIO
+    &pin_GPIO_AD_12,// SWCLK
 
     // FLEX flash
-    common_hal_never_reset_pin(&pin_GPIO_SD_12);
-    common_hal_never_reset_pin(&pin_GPIO_SD_11);
-    common_hal_never_reset_pin(&pin_GPIO_SD_10);
-    common_hal_never_reset_pin(&pin_GPIO_SD_09);
-    common_hal_never_reset_pin(&pin_GPIO_SD_08);
-    common_hal_never_reset_pin(&pin_GPIO_SD_07);
-    common_hal_never_reset_pin(&pin_GPIO_SD_06);
-}
+    &pin_GPIO_SD_12,
+    &pin_GPIO_SD_11,
+    &pin_GPIO_SD_10,
+    &pin_GPIO_SD_09,
+    &pin_GPIO_SD_08,
+    &pin_GPIO_SD_07,
+    &pin_GPIO_SD_06,
+    NULL,                       // Must end in NULL.
+};
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/board.c
@@ -26,31 +26,31 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.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);
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &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);
+    &pin_GPIO_AD_B0_04,
+    &pin_GPIO_AD_B0_06,
+    &pin_GPIO_AD_B0_07,
+    &pin_GPIO_AD_B0_08,
+    &pin_GPIO_AD_B0_09,
+    &pin_GPIO_AD_B0_10,
+    &pin_GPIO_EMC_01,
+    &pin_GPIO_B0_13,
+    &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
-}
+    &pin_GPIO_SD_B1_05,
+    NULL,                       // Must end in NULL.
+};
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/mimxrt10xx/boards/teensy40/board.c b/ports/mimxrt10xx/boards/teensy40/board.c
@@ -26,31 +26,32 @@
  */
 
 #include "supervisor/board.h"
-#include "boards/flash_config.h"
-#include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-void board_init(void) {
+// These pins should never ever be reset; doing so could interfere with basic operation.
+// Used in common-hal/microcontroller/Pin.c
+const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
     // 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);
+    &pin_GPIO_SD_B1_06,
+    &pin_GPIO_SD_B1_07,
+    &pin_GPIO_SD_B1_08,
+    &pin_GPIO_SD_B1_09,
+    &pin_GPIO_SD_B1_10,
+    &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);
+    &pin_GPIO_AD_B0_04,
+    &pin_GPIO_AD_B0_06,
+    &pin_GPIO_AD_B0_07,
+    &pin_GPIO_AD_B0_08,
+    &pin_GPIO_AD_B0_09,
+    &pin_GPIO_AD_B0_10,
+    &pin_GPIO_EMC_01,
+    &pin_GPIO_B0_13,
+    &pin_GPIO_AD_B0_11,
     // Data strobe needs protection despite being grounded
-    common_hal_never_reset_pin(&pin_GPIO_SD_B1_05);
-}
+    &pin_GPIO_SD_B1_05,
+    NULL,                       // Must end in NULL.
+};
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.