Skip to content

Commit 112a955

Browse files
committed
Merge branch 'feature/h21_reset_reason' into 'master'
feat(system): updated reset reasons for H21 Closes IDF-11542 See merge request espressif/esp-idf!38774
2 parents 826c69f + 298da83 commit 112a955

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

components/esp_rom/esp32h21/include/esp32h21/rom/rtc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ typedef enum {
8686
RTCWDT_BROWN_OUT_RESET = 15, /**<15, Reset when the vdd voltage is not stable*/
8787
RTCWDT_RTC_RESET = 16, /**<16, RTC Watch dog reset digital core and rtc module*/
8888
TG1WDT_CPU_RESET = 17, /**<17, Time Group1 reset CPU*/
89-
SUPER_WDT_RESET = 18, /**<18, super watchdog reset digital core and rtc module*/
9089
EFUSE_RESET = 20, /**<20, efuse reset digital core*/
9190
USB_UART_CHIP_RESET = 21, /**<21, usb uart reset digital core */
9291
USB_JTAG_CHIP_RESET = 22, /**<22, usb jtag reset digital core */
@@ -107,7 +106,6 @@ ESP_STATIC_ASSERT((soc_reset_reason_t)RTCWDT_CPU_RESET == RESET_REASON_CPU0_RTC_
107106
ESP_STATIC_ASSERT((soc_reset_reason_t)RTCWDT_BROWN_OUT_RESET == RESET_REASON_SYS_BROWN_OUT, "RTCWDT_BROWN_OUT_RESET != RESET_REASON_SYS_BROWN_OUT");
108107
ESP_STATIC_ASSERT((soc_reset_reason_t)RTCWDT_RTC_RESET == RESET_REASON_SYS_RTC_WDT, "RTCWDT_RTC_RESET != RESET_REASON_SYS_RTC_WDT");
109108
ESP_STATIC_ASSERT((soc_reset_reason_t)TG1WDT_CPU_RESET == RESET_REASON_CPU0_MWDT1, "TG1WDT_CPU_RESET != RESET_REASON_CPU0_MWDT1");
110-
ESP_STATIC_ASSERT((soc_reset_reason_t)SUPER_WDT_RESET == RESET_REASON_SYS_SUPER_WDT, "SUPER_WDT_RESET != RESET_REASON_SYS_SUPER_WDT");
111109
ESP_STATIC_ASSERT((soc_reset_reason_t)EFUSE_RESET == RESET_REASON_CORE_EFUSE_CRC, "EFUSE_RESET != RESET_REASON_CORE_EFUSE_CRC");
112110
ESP_STATIC_ASSERT((soc_reset_reason_t)USB_UART_CHIP_RESET == RESET_REASON_CORE_USB_UART, "USB_UART_CHIP_RESET != RESET_REASON_CORE_USB_UART");
113111
ESP_STATIC_ASSERT((soc_reset_reason_t)USB_JTAG_CHIP_RESET == RESET_REASON_CORE_USB_JTAG, "USB_JTAG_CHIP_RESET != RESET_REASON_CORE_USB_JTAG");

components/esp_system/port/soc/esp32h21/reset_reason.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include "soc/rtc_periph.h"
1111
#include "esp32h21/rom/rtc.h"
1212

13-
// TODO: [ESP32H21] IDF-11900, IDF-11910
14-
1513
static void esp_reset_reason_clear_hint(void);
1614

1715
static esp_reset_reason_t s_reset_reason;
@@ -43,7 +41,6 @@ static esp_reset_reason_t get_reset_reason(soc_reset_reason_t rtc_reset_reason,
4341

4442
case RESET_REASON_CORE_RTC_WDT:
4543
case RESET_REASON_SYS_RTC_WDT:
46-
case RESET_REASON_SYS_SUPER_WDT:
4744
case RESET_REASON_CPU0_RTC_WDT:
4845
case RESET_REASON_CPU0_MWDT0:
4946
case RESET_REASON_CPU0_MWDT1:

components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Unlicense OR CC0-1.0
55
*/
@@ -109,7 +109,11 @@ TEST_CASE_MULTIPLE_STAGES("reset reason ESP_RST_DEEPSLEEP", "[reset_reason]",
109109
static void do_exception(void)
110110
{
111111
setup_values();
112-
*(int*)(0x0) = 0;
112+
#ifdef __XTENSA__
113+
asm("ill"); // should be an invalid operation on xtensa targets
114+
#elif __riscv
115+
asm("unimp"); // should be an invalid operation on RISC-V targets
116+
#endif
113117
}
114118

115119
static void do_abort(void)

0 commit comments

Comments
 (0)