diff options
| -rw-r--r--[-rwxr-xr-x] | ports/esp32/modmachine.c | 2 | ||||
| -rw-r--r-- | ports/esp32/mpconfigport.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c index 6e6a57896..a61d381e0 100755..100644 --- a/ports/esp32/modmachine.c +++ b/ports/esp32/modmachine.c @@ -220,11 +220,13 @@ static mp_int_t mp_machine_reset_cause(void) { } } +#ifdef MICROPY_BOARD_ENTER_BOOTLOADER NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args) { MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args); for (;;) { } } +#endif void machine_init(void) { is_soft_reset = 0; diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index be02d4588..0474b7eaf 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -115,7 +115,6 @@ #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_INCLUDEFILE "ports/esp32/modmachine.c" #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1) -#define MICROPY_PY_MACHINE_BOOTLOADER (1) #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1) #define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE "ports/esp32/machine_adc.c" @@ -269,8 +268,10 @@ typedef long mp_off_t; #define MICROPY_HW_ENABLE_MDNS_RESPONDER (1) #endif -#ifndef MICROPY_BOARD_ENTER_BOOTLOADER -#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) +#ifdef MICROPY_BOARD_ENTER_BOOTLOADER +#define MICROPY_PY_MACHINE_BOOTLOADER (1) +#else +#define MICROPY_PY_MACHINE_BOOTLOADER (0) #endif #ifndef MICROPY_BOARD_STARTUP |