summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrent Piepho <tpiepho@gmail.com>2024-03-02 01:25:10 -0800
committerDamien George <damien@micropython.org>2024-03-08 15:55:17 +1100
commitaf67be7adc4b76fead096fecd445ddeb6cc2c513 (patch)
treee3ece0cbb8b50e6a62e8a79e6b1e5dabe8b6c732
parent9fc450689b7505a44460bd6cc3a25961e1e4306e (diff)
esp32/modmachine: Support bootloader on ESP32-S2/S3/C2/C3.
On these targets it's possible to enter the bootloader by setting a bit in an RTC register before resetting. Structure it in a way that a board can still provide a custom bootloader handler. The handler here will be the default if none is provided, for any board based on the supported targets. Signed-off-by: Trent Piepho <tpiepho@gmail.com>
-rw-r--r--ports/esp32/modmachine.c8
-rw-r--r--ports/esp32/mpconfigport.h8
2 files changed, 16 insertions, 0 deletions
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index a61d381e0..759455a59 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -220,6 +220,14 @@ static mp_int_t mp_machine_reset_cause(void) {
}
}
+#if MICROPY_ESP32_USE_BOOTLOADER_RTC
+#include "soc/rtc_cntl_reg.h"
+NORETURN static void machine_bootloader_rtc(void) {
+ REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT);
+ esp_restart();
+}
+#endif
+
#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);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 0474b7eaf..f004c78b0 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -268,6 +268,14 @@ typedef long mp_off_t;
#define MICROPY_HW_ENABLE_MDNS_RESPONDER (1)
#endif
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+// RTC has a register to trigger bootloader on these targets
+#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3
+#define MICROPY_ESP32_USE_BOOTLOADER_RTC (1)
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) machine_bootloader_rtc()
+#endif
+#endif
+
#ifdef MICROPY_BOARD_ENTER_BOOTLOADER
#define MICROPY_PY_MACHINE_BOOTLOADER (1)
#else