Merge branch 'fix/lp_core_noreset_under_debug_option_v6.1' into 'release/v6.1'

fix(lp_core): fix build for CONFIG_ULP_NORESET_UNDER_DEBUG=n (v6.1)

See merge request espressif/esp-idf!49866
This commit is contained in:
Jiang Jiang Jian
2026-07-03 20:26:21 +08:00

View File

@@ -159,7 +159,11 @@ esp_err_t ulp_lp_core_run(ulp_lp_core_cfg_t* cfg)
/* Enable reset CPU when going to sleep */
/* Avoid resetting chip in sleep mode when debugger is attached,
otherwise configured HW breakpoints and dcsr.ebreak* bits will be missed */
lp_core_ll_rst_at_sleep_enable(!(CONFIG_ULP_NORESET_UNDER_DEBUG && esp_cpu_dbgr_is_attached()));
#if CONFIG_ULP_NORESET_UNDER_DEBUG
lp_core_ll_rst_at_sleep_enable(!esp_cpu_dbgr_is_attached());
#else
lp_core_ll_rst_at_sleep_enable(true);
#endif
/* Set wake-up sources */
lp_core_ll_set_wakeup_source(lp_core_get_wakeup_source_hw_flags(cfg->wakeup_source));
@@ -329,7 +333,11 @@ void ulp_lp_core_stop(void)
lp_core_ll_stall_at_sleep_request(true);
/* Avoid resetting chip in sleep mode when debugger is attached,
otherwise configured HW breakpoints and dcsr.ebreak* bits will be missed */
lp_core_ll_rst_at_sleep_enable(!CONFIG_ULP_NORESET_UNDER_DEBUG);
#if CONFIG_ULP_NORESET_UNDER_DEBUG
lp_core_ll_rst_at_sleep_enable(false);
#else
lp_core_ll_rst_at_sleep_enable(true);
#endif
lp_core_ll_debug_module_enable(true);
}
/* Disable wake-up source and put lp core to sleep */