8000 Merge pull request #3001 from hierophect/mimxrt-teensy-boot · jensechu/circuitpython@6400113 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6400113

Browse files
tannewttannewt
authored
Merge pull request adafruit#3001 from hierophect/mimxrt-teensy-boot
mimxrt10xx: Disable pin_reset on 1060 boards
2 parents fffe171 + 74effee commit 6400113

File tree

3 files changed

+32
-8
lines changed

3 files changed

+32
-8
lines changed

‎ports/mimxrt10xx/boards/teensy40/board.c

Lines changed: 10 additions & 8 deletions
8000
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
#include "shared-bindings/microcontroller/Pin.h"
3131

3232
void board_init(void) {
33-
// SWD Pins
34-
common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);//SWDIO
35-
common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);//SWCLK
36-
common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);//SWO
37-
3833
// FLEX flash
3934
common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
4035
common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
@@ -43,9 +38,16 @@ void board_init(void) {
4338
common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
4439
common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
4540

46-
// USB Pins
47-
common_hal_never_reset_pin(&pin_GPIO_AD_B0_01);
48-
common_hal_never_reset_pin(&pin_GPIO_AD_B0_03);
41+
// FLEX flash 2
42+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);
43+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);
44+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);
45+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_08);
46+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_09);
47+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);
48+
common_hal_never_reset_pin(&pin_GPIO_EMC_01);
49+
common_hal_never_reset_pin(&pin_GPIO_B0_13);
50+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_11);
4951
}
5052

5153
bool board_requests_safe_mode(void) {

‎ports/mimxrt10xx/boards/teensy41/board.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,27 @@
2727

2828
#include "boards/board.h"
2929
#include "mpconfigboard.h"
30+
#include "shared-bindings/microcontroller/Pin.h"
3031

3132
void board_init(void) {
33+
// FLEX flash
34+
common_hal_never_reset_pin(&pin_GPIO_SD_B1_06);
35+
common_hal_never_reset_pin(&pin_GPIO_SD_B1_07);
36+
common_hal_never_reset_pin(&pin_GPIO_SD_B1_08);
37+
common_hal_never_reset_pin(&pin_GPIO_SD_B1_09);
38+
common_hal_never_reset_pin(&pin_GPIO_SD_B1_10);
39+
common_hal_never_reset_pin(&pin_GPIO_SD_B1_11);
40+
41+
// FLEX flash 2
42+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_04);
43+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_06);
44+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_07);
45+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_08);
46+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_09);
47+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_10);
48+
common_hal_never_reset_pin(&pin_GPIO_EMC_01);
49+
common_hal_never_reset_pin(&pin_GPIO_B0_13);
50+
common_hal_never_reset_pin(&pin_GPIO_AD_B0_11);
3251
}
3352

3453
bool board_requests_safe_mode(void) {

‎ports/mimxrt10xx/supervisor/port.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,10 @@ void reset_port(void) {
306306

307307
//reset_event_system();
308308

309+
// TODO: implement a proper fix for 1060 resets
310+
#if !defined (MIMXRT1062_SERIES)
309311
reset_all_pins();
312+
#endif
310313
}
311314

312315
void reset_to_bootloader(void) {

0 commit comments

Comments
 (0)
0