feat: add c61 support on bootloader plus

Author: WangYuxin-esp

components/bootloader_support_plus/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v0.4.0 - 2025-09-08
+
+### Improve:
+
+- Add ESP32-C61 support.
+
 ## v0.3.9 - 2025-06-17
 
 ### Improve:

components/bootloader_support_plus/README.md

@@ -15,6 +15,7 @@ The `bootloader support plus` is an enhanced bootloader based on [custom_bootloa
 | ESP32-C5 | N/A | N/A | Supported |
 | ESP32-C6 | N/A | Supported | Supported |
 | ESP32-H2 | N/A | Supported | Supported |
+| ESP32-C61 | N/A | N/A  | Supported |
 
 ## Compression ratio
 

components/bootloader_support_plus/README_CN.md

@@ -15,6 +15,7 @@ bootloader support plus 是乐鑫基于 [ESP-IDF](https://github.com/espressif/e
 | ESP32-C5 | N/A | N/A | Supported |
 | ESP32-C6 | N/A | Supported | Supported |
 | ESP32-H2 | N/A | Supported | Supported |
+| ESP32-C61 | N/A | N/A  | Supported |
 
 ## 压缩率
 

components/bootloader_support_plus/idf_component.yml

@@ -1,9 +1,10 @@
-version: "0.3.9"
+version: "0.4.0"
 targets:
   - esp32c2
   - esp32c3
   - esp32c5
   - esp32c6
+  - esp32c61
   - esp32
   - esp32h2
 description: Provide extra bootloader support, now support upgrading the firmware by decompressing the OTA firmware in the bootloader stage.

components/bootloader_support_plus/ld/esp32c61/linker.lf

@@ -0,0 +1,16 @@
+MEMORY
+{
+  iram_loader1_seg (RWX) :           org = 0x4084A000, len = 0x6000
+}
+
+SECTIONS
+{
+  .xz :
+  {
+    . = ALIGN(4);
+    *libbootloader_support_plus.a:(.literal .text .literal.* .text.*)
+    *libespressif__bootloader_support_plus.a:(.literal .text .literal.* .text.*)
+    *libespressif__xz.a:(.literal .text .literal.* .text.*)
+    *libxz.a:(.literal .text .literal.* .text.*)
+  } > iram_loader1_seg
+}

components/bootloader_support_plus/private_include/bootloader_custom_utility.h

@@ -10,6 +10,17 @@
 #include "bootloader_utility.h"
 #include "bootloader_custom_ota.h"
 
+#ifdef CONFIG_BOOTLOADER_WDT_ENABLE
+#include "hal/wdt_hal.h"
+#if !defined(RWDT_HAL_CONTEXT_DEFAULT)
+#if CONFIG_IDF_TARGET_ESP32H2
+#define RWDT_HAL_CONTEXT_DEFAULT()     {.inst = WDT_RWDT, .rwdt_dev = &LP_WDT}
+#else
+#define RWDT_HAL_CONTEXT_DEFAULT()     {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL}
+#endif
+#endif // RWDT_HAL_CONTEXT_DEFAULT
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

components/bootloader_support_plus/src/bootloader_custom_ota.c

@@ -225,13 +225,8 @@ int bootloader_custom_ota_main(bootloader_state_t *bs, int boot_index)
     so we can know whether the watchdog reset will be triggered here at the test stage.
     */
 #ifdef CONFIG_BOOTLOADER_WDT_ENABLE
-#if (defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32C5))
     wdt_hal_context_t rtc_wdt_ctx = RWDT_HAL_CONTEXT_DEFAULT();
-#elif CONFIG_IDF_TARGET_ESP32H2
-    wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &LP_WDT};
-#else
-    wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL};
-#endif
+
     if ((custom_ota_config.dst_addr % FLASH_SECTOR_SIZE) != 0 || (custom_ota_config.dst_size % FLASH_SECTOR_SIZE != 0)) {
         return ESP_ERR_INVALID_SIZE;
     }

components/bootloader_support_plus/src/bootloader_storage_flash.c

@@ -14,12 +14,7 @@
 #include "bootloader_custom_malloc.h" // Note, this header is just used to provide malloc() and free() support.
 
 #ifdef CONFIG_BOOTLOADER_WDT_ENABLE
-#include "hal/wdt_hal.h"
-#if (ESP_IDF_VERSION_MAJOR == 5) && (ESP_IDF_VERSION_MINOR >= 1)
 static wdt_hal_context_t rtc_wdt_ctx = RWDT_HAL_CONTEXT_DEFAULT();
-#else
-static wdt_hal_context_t rtc_wdt_ctx = {.inst = WDT_RWDT, .rwdt_dev = &RTCCNTL};
-#endif // ESP_IDF_VERSION_MAJOR
 static bool rtc_wdt_ctx_enabled = false;
 #endif