Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/build_fail_c6_usb_serial_jtag' into 'master'

Browse Source 
fix build with CONFIG_ESP_CONSOLE_UART=n on C6, re-enable build tests for C6 and C2

Closes IDFGH-10698

See merge request espressif/esp-idf!24935
This commit is contained in:
Ivan Grokhotkov
2023-09-25 20:39:32 +08:00
parent f6c76aa3c8 2fe4fe2c19
commit 8545f8595f
13 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hw_support/sleep_modes.c
+2 -2
View File
@@ -489,12 +489,12 @@ FORCE_INLINE_ATTR void resume_uarts(void)
FORCE_INLINE_ATTR bool light_sleep_uart_prepare(uint32_t pd_flags, int64_t sleep_duration)
{
bool should_skip_sleep = false;
#if !SOC_PM_SUPPORT_TOP_PD
#if !SOC_PM_SUPPORT_TOP_PD || !CONFIG_ESP_CONSOLE_UART
suspend_uarts();
#else
if (pd_flags & PMU_SLEEP_PD_TOP) {
if ((s_config.wakeup_triggers & RTC_TIMER_TRIG_EN) &&
// +1 is for cover the last charactor flush time
// +1 is for cover the last character flush time
(sleep_duration < (int64_t)((UART_LL_FIFO_DEF_LEN - uart_ll_get_txfifo_len(CONSOLE_UART_DEV) + 1) * UART_FLUSH_US_PER_CHAR) + SLEEP_UART_FLUSH_DONE_TO_SLEEP_US)) {
should_skip_sleep = true;
} else {