Skip to content

Commit

Permalink
Merge branch 'bugfix/build_fail_c6_usb_serial_jtag' into 'master'
Browse files Browse the repository at this point in the history
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
igrr committed Sep 25, 2023

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
2 parents f6c76aa + 2fe4fe2 commit 8545f85
Showing 13 changed files with 12 additions and 30 deletions.
4 changes: 2 additions & 2 deletions components/esp_hw_support/sleep_modes.c
Original file line number Diff line number Diff line change
@@ -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 {
6 changes: 6 additions & 0 deletions tools/test_apps/.build-test-rules.yml
Original file line number Diff line number Diff line change
@@ -76,6 +76,12 @@ tools/test_apps/system/bootloader_sections:

tools/test_apps/system/build_test:
disable:
# For ROM impl build tests, disable them if none of the tested features are supported in the ROM
- if: CONFIG_NAME == "rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1 and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1))
- if: CONFIG_NAME == "no_rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1 and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1))
- if: CONFIG_NAME == "no_rvfplib" and ESP_ROM_HAS_RVFPLIB != 1
- if: CONFIG_NAME == "usb_serial_jtag" AND SOC_USB_SERIAL_JTAG_SUPPORTED != 1
- if: CONFIG_NAME == "usb_console_ets_printf" AND SOC_USB_OTG_SUPPORTED != 1
- if: IDF_TARGET in ["esp32p4"]
temporary: true
reason: target(s) not supported yet #TODO: IDF-8119
2 changes: 0 additions & 2 deletions tools/test_apps/system/build_test/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

Efuse on ESP32-C2 not supported

This project is for testing if the application can be built with a particular sdkconfig setting.

To add new configuration, create one more sdkconfig.ci.NAME file in this directory.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CONFIG_IDF_TARGET="esp32h2"
CONFIG_HAL_WDT_USE_ROM_IMPL=n
CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=n
CONFIG_HEAP_TLSF_USE_ROM_IMPL=n
CONFIG_SPI_FLASH_ROM_IMPL=n

# update tools/test_apps/.build-test-rules.yml if adding more ROM options above!
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CONFIG_IDF_TARGET="esp32c2"
CONFIG_HAL_WDT_USE_ROM_IMPL=y
CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=y
CONFIG_HEAP_TLSF_USE_ROM_IMPL=y
CONFIG_SPI_FLASH_ROM_IMPL=y

# update tools/test_apps/.build-test-rules.yml if adding more ROM options above!
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
CONFIG_IDF_TARGET="esp32s3"
CONFIG_ESP_CONSOLE_USB_CDC=y
CONFIG_ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF=y
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
CONFIG_IDF_TARGET="esp32c3"
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y

0 comments on commit 8545f85

Please sign in to comment.