-
Notifications
You must be signed in to change notification settings - Fork 7.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'bugfix/build_fail_c6_usb_serial_jtag' into 'master'
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
Showing
13 changed files
with
12 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rom_impl_components
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_with_rom_impl_components
This file was deleted.
Oops, something went wrong.
3 changes: 2 additions & 1 deletion
3
...ig.ci.esp32h2_without_rom_impl_components → ..._test/sdkconfig.ci.no_rom_impl_components
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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! |
File renamed without changes.
3 changes: 2 additions & 1 deletion
3
...onfig.ci.esp32c2_with_rom_impl_components → ...ild_test/sdkconfig.ci.rom_impl_components
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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! |
1 change: 0 additions & 1 deletion
1
tools/test_apps/system/build_test/sdkconfig.ci.usb_console_ets_printf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
CONFIG_IDF_TARGET="esp32c3" | ||
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y |