Merge pull request adafruit#5270 from pewpew-game/safe-mode-wait

tannewt · web-flow · commit 80675107cf46 · 2021-08-31T09:56:29.000-07:00
Add a flag to skip waiting for safe mode
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
@@ -66,6 +66,9 @@ safe_mode_t wait_for_safe_mode_reset(void) {
         reset_reason != RESET_REASON_SOFTWARE) {
         return NO_SAFE_MODE;
     }
+    #ifdef CIRCUITPY_SKIP_SAFE_MODE_WAIT
+    return NO_SAFE_MODE;
+    #endif
     port_set_saved_word(SAFE_MODE_DATA_GUARD | (MANUAL_SAFE_MODE << 8));
     // Wait for a while to allow for reset.
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ safe_mode_t wait_for_safe_mode_reset(void) {`
`66`	`66`	`reset_reason != RESET_REASON_SOFTWARE) {`
`67`	`67`	`return NO_SAFE_MODE;`
`68`	`68`	`}`
	`69`	`+ #ifdef CIRCUITPY_SKIP_SAFE_MODE_WAIT`
	`70`	`+ return NO_SAFE_MODE;`
	`71`	`+ #endif`
`69`	`72`	`port_set_saved_word(SAFE_MODE_DATA_GUARD \| (MANUAL_SAFE_MODE << 8));`
`70`	`73`	`// Wait for a while to allow for reset.`
`71`	`74`