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

Add a flag to skip waiting for safe mode
This commit is contained in:
Scott Shawcroft 2021-08-31 09:56:29 -07:00 committed by GitHub
commit 80675107cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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.