From 83907aaa200a8438bee3b38df75b87801f95b205 Mon Sep 17 00:00:00 2001 From: Omar Chebib Date: Tue, 27 Sep 2022 14:41:12 +0800 Subject: [PATCH] TWDT: Use the new TWDT Kconfig options in the examples and tests --- components/cxx/test_apps/exception/sdkconfig.defaults | 2 +- .../cxx/test_apps/exception_no_except/sdkconfig.defaults | 2 +- components/cxx/test_apps/general/sdkconfig.defaults | 2 +- components/cxx/test_apps/rtti/sdkconfig.defaults | 2 +- components/driver/test_apps/gpio/sdkconfig.defaults | 2 +- components/driver/test_apps/gptimer/sdkconfig.defaults | 2 +- .../driver/test_apps/i2s_test_apps/i2s/sdkconfig.defaults | 2 +- .../i2s_test_apps/legacy_i2s_adc_dac/sdkconfig.defaults | 2 +- .../i2s_test_apps/legacy_i2s_driver/sdkconfig.defaults | 2 +- .../driver/test_apps/legacy_adc_driver/sdkconfig.defaults | 2 +- .../driver/test_apps/legacy_mcpwm_driver/sdkconfig.defaults | 2 +- .../driver/test_apps/legacy_pcnt_driver/sdkconfig.defaults | 2 +- .../driver/test_apps/legacy_rmt_driver/sdkconfig.defaults | 2 +- .../driver/test_apps/legacy_rtc_temp_driver/sdkconfig.defaults | 2 +- .../driver/test_apps/legacy_timer_driver/sdkconfig.defaults | 2 +- components/driver/test_apps/mcpwm/sdkconfig.defaults | 2 +- components/driver/test_apps/pulse_cnt/sdkconfig.defaults | 2 +- components/driver/test_apps/rmt/sdkconfig.defaults | 2 +- components/driver/test_apps/sdm/sdkconfig.defaults | 2 +- .../driver/test_apps/temperature_sensor/sdkconfig.defaults | 2 +- components/driver/test_apps/touch_sensor_v1/sdkconfig.defaults | 2 +- components/driver/test_apps/touch_sensor_v2/sdkconfig.defaults | 2 +- components/esp_adc/test_apps/adc/sdkconfig.defaults | 2 +- components/esp_eth/test_apps/sdkconfig.ci.ip101 | 2 +- components/esp_eth/test_apps/sdkconfig.ci.lan8720 | 2 +- components/esp_psram/test_apps/psram/sdkconfig.defaults | 2 +- components/esp_system/sdkconfig.rename | 2 +- components/esp_system/test_apps/rtc_8md256/sdkconfig.defaults | 2 +- .../esp_system/test_apps/rtc_power_modes/sdkconfig.defaults | 2 +- .../spi_flash/test_apps/flash_encryption/sdkconfig.ci.release | 2 +- .../test_apps/flash_encryption/sdkconfig.ci.release_f4r8 | 2 +- .../test_apps/flash_encryption/sdkconfig.ci.release_f8r8 | 2 +- .../spi_flash/test_apps/flash_encryption/sdkconfig.defaults | 2 +- components/touch_element/test_apps/sdkconfig.defaults | 2 +- components/ulp/test_apps/ulp_fsm/sdkconfig.defaults | 2 +- components/ulp/test_apps/ulp_riscv/sdkconfig.defaults | 2 +- .../esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults | 2 +- .../ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3 | 2 +- .../ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3 | 2 +- examples/ethernet/iperf/sdkconfig.defaults | 2 +- examples/system/gdbstub/sdkconfig.defaults | 2 +- examples/system/unit_test/test/sdkconfig.defaults | 2 +- examples/wifi/iperf/sdkconfig.ci.00 | 2 +- examples/wifi/iperf/sdkconfig.ci.01 | 2 +- examples/wifi/iperf/sdkconfig.ci.02 | 2 +- examples/wifi/iperf/sdkconfig.ci.03 | 2 +- examples/wifi/iperf/sdkconfig.ci.04 | 2 +- examples/wifi/iperf/sdkconfig.ci.05 | 2 +- examples/wifi/iperf/sdkconfig.ci.06 | 2 +- examples/wifi/iperf/sdkconfig.ci.07 | 2 +- examples/wifi/iperf/sdkconfig.defaults | 2 +- examples/zigbee/light_sample/light_bulb/sdkconfig.defaults | 1 - examples/zigbee/light_sample/light_switch/sdkconfig.defaults | 1 - tools/ldgen/samples/sdkconfig | 3 ++- tools/test_apps/system/longjmp_test/sdkconfig.defaults | 2 +- 55 files changed, 54 insertions(+), 55 deletions(-) diff --git a/components/cxx/test_apps/exception/sdkconfig.defaults b/components/cxx/test_apps/exception/sdkconfig.defaults index 198337030a..eaaf71de7e 100644 --- a/components/cxx/test_apps/exception/sdkconfig.defaults +++ b/components/cxx/test_apps/exception/sdkconfig.defaults @@ -4,7 +4,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y CONFIG_COMPILER_STACK_CHECK=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y diff --git a/components/cxx/test_apps/exception_no_except/sdkconfig.defaults b/components/cxx/test_apps/exception_no_except/sdkconfig.defaults index add1851e93..3402ab7707 100644 --- a/components/cxx/test_apps/exception_no_except/sdkconfig.defaults +++ b/components/cxx/test_apps/exception_no_except/sdkconfig.defaults @@ -4,7 +4,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y CONFIG_COMPILER_STACK_CHECK=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y diff --git a/components/cxx/test_apps/general/sdkconfig.defaults b/components/cxx/test_apps/general/sdkconfig.defaults index beea275c4e..cf6078c653 100644 --- a/components/cxx/test_apps/general/sdkconfig.defaults +++ b/components/cxx/test_apps/general/sdkconfig.defaults @@ -2,7 +2,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y CONFIG_COMPILER_STACK_CHECK=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y diff --git a/components/cxx/test_apps/rtti/sdkconfig.defaults b/components/cxx/test_apps/rtti/sdkconfig.defaults index 091acbbe43..a6221d1d50 100644 --- a/components/cxx/test_apps/rtti/sdkconfig.defaults +++ b/components/cxx/test_apps/rtti/sdkconfig.defaults @@ -5,7 +5,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y CONFIG_COMPILER_STACK_CHECK=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y diff --git a/components/driver/test_apps/gpio/sdkconfig.defaults b/components/driver/test_apps/gpio/sdkconfig.defaults index a0545fb89b..4299d6efa2 100644 --- a/components/driver/test_apps/gpio/sdkconfig.defaults +++ b/components/driver/test_apps/gpio/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_SDM_SUPPRESS_DEPRECATE_WARN=y diff --git a/components/driver/test_apps/gptimer/sdkconfig.defaults b/components/driver/test_apps/gptimer/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/driver/test_apps/gptimer/sdkconfig.defaults +++ b/components/driver/test_apps/gptimer/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/i2s_test_apps/i2s/sdkconfig.defaults b/components/driver/test_apps/i2s_test_apps/i2s/sdkconfig.defaults index b1692edbce..b56409727b 100644 --- a/components/driver/test_apps/i2s_test_apps/i2s/sdkconfig.defaults +++ b/components/driver/test_apps/i2s_test_apps/i2s/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_I2S_ENABLE_DEBUG_LOG=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/i2s_test_apps/legacy_i2s_adc_dac/sdkconfig.defaults b/components/driver/test_apps/i2s_test_apps/legacy_i2s_adc_dac/sdkconfig.defaults index 4295a349c9..e9e06ab320 100644 --- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_adc_dac/sdkconfig.defaults +++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_adc_dac/sdkconfig.defaults @@ -1,4 +1,4 @@ CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y CONFIG_I2S_ENABLE_DEBUG_LOG=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/sdkconfig.defaults b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/sdkconfig.defaults index 4295a349c9..e9e06ab320 100644 --- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/sdkconfig.defaults +++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/sdkconfig.defaults @@ -1,4 +1,4 @@ CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y CONFIG_I2S_ENABLE_DEBUG_LOG=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/legacy_adc_driver/sdkconfig.defaults b/components/driver/test_apps/legacy_adc_driver/sdkconfig.defaults index 2b6418fbd4..88d4fecf25 100644 --- a/components/driver/test_apps/legacy_adc_driver/sdkconfig.defaults +++ b/components/driver/test_apps/legacy_adc_driver/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y diff --git a/components/driver/test_apps/legacy_mcpwm_driver/sdkconfig.defaults b/components/driver/test_apps/legacy_mcpwm_driver/sdkconfig.defaults index 4c808e5adc..9e494a19fb 100644 --- a/components/driver/test_apps/legacy_mcpwm_driver/sdkconfig.defaults +++ b/components/driver/test_apps/legacy_mcpwm_driver/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN=y diff --git a/components/driver/test_apps/legacy_pcnt_driver/sdkconfig.defaults b/components/driver/test_apps/legacy_pcnt_driver/sdkconfig.defaults index 342f5b48ae..89ff765c1e 100644 --- a/components/driver/test_apps/legacy_pcnt_driver/sdkconfig.defaults +++ b/components/driver/test_apps/legacy_pcnt_driver/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN=y diff --git a/components/driver/test_apps/legacy_rmt_driver/sdkconfig.defaults b/components/driver/test_apps/legacy_rmt_driver/sdkconfig.defaults index c16b1aed99..34716641fe 100644 --- a/components/driver/test_apps/legacy_rmt_driver/sdkconfig.defaults +++ b/components/driver/test_apps/legacy_rmt_driver/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y diff --git a/components/driver/test_apps/legacy_rtc_temp_driver/sdkconfig.defaults b/components/driver/test_apps/legacy_rtc_temp_driver/sdkconfig.defaults index 4335b5386b..f8fdd36201 100644 --- a/components/driver/test_apps/legacy_rtc_temp_driver/sdkconfig.defaults +++ b/components/driver/test_apps/legacy_rtc_temp_driver/sdkconfig.defaults @@ -1,2 +1,2 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_TEMP_SENSOR_SUPPRESS_DEPRECATE_WARN=y diff --git a/components/driver/test_apps/legacy_timer_driver/sdkconfig.defaults b/components/driver/test_apps/legacy_timer_driver/sdkconfig.defaults index daa206f8c7..889dd35776 100644 --- a/components/driver/test_apps/legacy_timer_driver/sdkconfig.defaults +++ b/components/driver/test_apps/legacy_timer_driver/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN=y diff --git a/components/driver/test_apps/mcpwm/sdkconfig.defaults b/components/driver/test_apps/mcpwm/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/driver/test_apps/mcpwm/sdkconfig.defaults +++ b/components/driver/test_apps/mcpwm/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/pulse_cnt/sdkconfig.defaults b/components/driver/test_apps/pulse_cnt/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/driver/test_apps/pulse_cnt/sdkconfig.defaults +++ b/components/driver/test_apps/pulse_cnt/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/rmt/sdkconfig.defaults b/components/driver/test_apps/rmt/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/driver/test_apps/rmt/sdkconfig.defaults +++ b/components/driver/test_apps/rmt/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/sdm/sdkconfig.defaults b/components/driver/test_apps/sdm/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/driver/test_apps/sdm/sdkconfig.defaults +++ b/components/driver/test_apps/sdm/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/temperature_sensor/sdkconfig.defaults b/components/driver/test_apps/temperature_sensor/sdkconfig.defaults index a1f2ef6f8b..e4bfc208a5 100644 --- a/components/driver/test_apps/temperature_sensor/sdkconfig.defaults +++ b/components/driver/test_apps/temperature_sensor/sdkconfig.defaults @@ -1 +1 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/touch_sensor_v1/sdkconfig.defaults b/components/driver/test_apps/touch_sensor_v1/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/driver/test_apps/touch_sensor_v1/sdkconfig.defaults +++ b/components/driver/test_apps/touch_sensor_v1/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/driver/test_apps/touch_sensor_v2/sdkconfig.defaults b/components/driver/test_apps/touch_sensor_v2/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/driver/test_apps/touch_sensor_v2/sdkconfig.defaults +++ b/components/driver/test_apps/touch_sensor_v2/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/esp_adc/test_apps/adc/sdkconfig.defaults b/components/esp_adc/test_apps/adc/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/esp_adc/test_apps/adc/sdkconfig.defaults +++ b/components/esp_adc/test_apps/adc/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/esp_eth/test_apps/sdkconfig.ci.ip101 b/components/esp_eth/test_apps/sdkconfig.ci.ip101 index a09d07030c..87d30e611f 100644 --- a/components/esp_eth/test_apps/sdkconfig.ci.ip101 +++ b/components/esp_eth/test_apps/sdkconfig.ci.ip101 @@ -2,6 +2,6 @@ CONFIG_IDF_TARGET="esp32" CONFIG_UNITY_ENABLE_FIXTURE=y CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_TARGET_ETH_PHY_DEVICE_IP101=y diff --git a/components/esp_eth/test_apps/sdkconfig.ci.lan8720 b/components/esp_eth/test_apps/sdkconfig.ci.lan8720 index a061347db0..0f1830f013 100644 --- a/components/esp_eth/test_apps/sdkconfig.ci.lan8720 +++ b/components/esp_eth/test_apps/sdkconfig.ci.lan8720 @@ -2,7 +2,7 @@ CONFIG_IDF_TARGET="esp32" CONFIG_UNITY_ENABLE_FIXTURE=y CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y CONFIG_ETH_USE_ESP32_EMAC=y -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_TARGET_ETH_PHY_DEVICE_LAN87XX=y CONFIG_ETH_RMII_CLK_OUTPUT=y diff --git a/components/esp_psram/test_apps/psram/sdkconfig.defaults b/components/esp_psram/test_apps/psram/sdkconfig.defaults index 95033f3fc2..14d70b5fc7 100644 --- a/components/esp_psram/test_apps/psram/sdkconfig.defaults +++ b/components/esp_psram/test_apps/psram/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_SPIRAM=y diff --git a/components/esp_system/sdkconfig.rename b/components/esp_system/sdkconfig.rename index 826f9cb0a3..69d982545c 100644 --- a/components/esp_system/sdkconfig.rename +++ b/components/esp_system/sdkconfig.rename @@ -21,7 +21,7 @@ CONFIG_CONSOLE_UART_BAUDRATE CONFIG_ESP_CONSOLE_UART_ CONFIG_INT_WDT CONFIG_ESP_INT_WDT CONFIG_INT_WDT_TIMEOUT_MS CONFIG_ESP_INT_WDT_TIMEOUT_MS CONFIG_INT_WDT_CHECK_CPU1 CONFIG_ESP_INT_WDT_CHECK_CPU1 -CONFIG_TASK_WDT CONFIG_ESP_TASK_WDT +CONFIG_TASK_WDT CONFIG_ESP_TASK_WDT_INIT CONFIG_TASK_WDT_PANIC CONFIG_ESP_TASK_WDT_PANIC CONFIG_TASK_WDT_TIMEOUT_S CONFIG_ESP_TASK_WDT_TIMEOUT_S CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 diff --git a/components/esp_system/test_apps/rtc_8md256/sdkconfig.defaults b/components/esp_system/test_apps/rtc_8md256/sdkconfig.defaults index 3660129c9f..0d05e428a6 100644 --- a/components/esp_system/test_apps/rtc_8md256/sdkconfig.defaults +++ b/components/esp_system/test_apps/rtc_8md256/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_RTC_CLK_SRC_INT_8MD256=y diff --git a/components/esp_system/test_apps/rtc_power_modes/sdkconfig.defaults b/components/esp_system/test_apps/rtc_power_modes/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/esp_system/test_apps/rtc_power_modes/sdkconfig.defaults +++ b/components/esp_system/test_apps/rtc_power_modes/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release index 30af9881e7..4af656c73f 100644 --- a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release +++ b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release @@ -1,4 +1,4 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_FREERTOS_USE_TICKLESS_IDLE=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y diff --git a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8 b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8 index e4954dd99b..63a6a812ad 100644 --- a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8 +++ b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f4r8 @@ -1,4 +1,4 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_FREERTOS_USE_TICKLESS_IDLE=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y diff --git a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8 b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8 index dc83642baa..5acf0f9f59 100644 --- a/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8 +++ b/components/spi_flash/test_apps/flash_encryption/sdkconfig.ci.release_f8r8 @@ -1,4 +1,4 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_FREERTOS_USE_TICKLESS_IDLE=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y diff --git a/components/spi_flash/test_apps/flash_encryption/sdkconfig.defaults b/components/spi_flash/test_apps/flash_encryption/sdkconfig.defaults index ebf0e8ec3e..5caa7b2107 100644 --- a/components/spi_flash/test_apps/flash_encryption/sdkconfig.defaults +++ b/components/spi_flash/test_apps/flash_encryption/sdkconfig.defaults @@ -1,4 +1,4 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" CONFIG_SECURE_FLASH_ENC_ENABLED=y diff --git a/components/touch_element/test_apps/sdkconfig.defaults b/components/touch_element/test_apps/sdkconfig.defaults index 3baab5a252..2fbb4c94d1 100644 --- a/components/touch_element/test_apps/sdkconfig.defaults +++ b/components/touch_element/test_apps/sdkconfig.defaults @@ -1,3 +1,3 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 diff --git a/components/ulp/test_apps/ulp_fsm/sdkconfig.defaults b/components/ulp/test_apps/ulp_fsm/sdkconfig.defaults index 2c9f36e096..a2d3eeb79f 100644 --- a/components/ulp/test_apps/ulp_fsm/sdkconfig.defaults +++ b/components/ulp/test_apps/ulp_fsm/sdkconfig.defaults @@ -1,4 +1,4 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_FSM=y diff --git a/components/ulp/test_apps/ulp_riscv/sdkconfig.defaults b/components/ulp/test_apps/ulp_riscv/sdkconfig.defaults index 93a2597ea9..73c24b77f1 100644 --- a/components/ulp/test_apps/ulp_riscv/sdkconfig.defaults +++ b/components/ulp/test_apps/ulp_riscv/sdkconfig.defaults @@ -1,4 +1,4 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_RISCV=y diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults index 838996f1e3..130e511b5f 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults @@ -42,7 +42,7 @@ CONFIG_FREERTOS_UNICORE=n CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534 CONFIG_LWIP_TCP_WND_DEFAULT=65534 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3 index 734e396d7a..46507b0fd1 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c3 @@ -41,7 +41,7 @@ CONFIG_FREERTOS_UNICORE=n CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534 CONFIG_LWIP_TCP_WND_DEFAULT=65534 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3 index 734e396d7a..46507b0fd1 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3 @@ -41,7 +41,7 @@ CONFIG_FREERTOS_UNICORE=n CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534 CONFIG_LWIP_TCP_WND_DEFAULT=65534 diff --git a/examples/ethernet/iperf/sdkconfig.defaults b/examples/ethernet/iperf/sdkconfig.defaults index 9377df864b..17bd3fe137 100644 --- a/examples/ethernet/iperf/sdkconfig.defaults +++ b/examples/ethernet/iperf/sdkconfig.defaults @@ -17,7 +17,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # Disable watch dog CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n # Enable lwIP IRAM optimization CONFIG_LWIP_IRAM_OPTIMIZATION=y diff --git a/examples/system/gdbstub/sdkconfig.defaults b/examples/system/gdbstub/sdkconfig.defaults index 20e216f743..38a8bd3ca8 100644 --- a/examples/system/gdbstub/sdkconfig.defaults +++ b/examples/system/gdbstub/sdkconfig.defaults @@ -14,5 +14,5 @@ CONFIG_ESP_GDBSTUB_MAX_TASKS=32 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME=y # CONFIG_ESP_INT_WDT is not set -# CONFIG_ESP_TASK_WDT is not set +# CONFIG_ESP_TASK_WDT_EN is not set # end of ESP System Settings diff --git a/examples/system/unit_test/test/sdkconfig.defaults b/examples/system/unit_test/test/sdkconfig.defaults index a1f2ef6f8b..e4bfc208a5 100644 --- a/examples/system/unit_test/test/sdkconfig.defaults +++ b/examples/system/unit_test/test/sdkconfig.defaults @@ -1 +1 @@ -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/examples/wifi/iperf/sdkconfig.ci.00 b/examples/wifi/iperf/sdkconfig.ci.00 index ca2a31cf6c..9463e8f84b 100644 --- a/examples/wifi/iperf/sdkconfig.ci.00 +++ b/examples/wifi/iperf/sdkconfig.ci.00 @@ -3,4 +3,4 @@ CONFIG_MEMMAP_SMP=y CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/examples/wifi/iperf/sdkconfig.ci.01 b/examples/wifi/iperf/sdkconfig.ci.01 index 91ac6effaf..d322656ab3 100644 --- a/examples/wifi/iperf/sdkconfig.ci.01 +++ b/examples/wifi/iperf/sdkconfig.ci.01 @@ -1,7 +1,7 @@ CONFIG_MEMMAP_SMP=y CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 diff --git a/examples/wifi/iperf/sdkconfig.ci.02 b/examples/wifi/iperf/sdkconfig.ci.02 index 03c09deb1e..f21cfce0ee 100644 --- a/examples/wifi/iperf/sdkconfig.ci.02 +++ b/examples/wifi/iperf/sdkconfig.ci.02 @@ -1,7 +1,7 @@ CONFIG_MEMMAP_SMP=y CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 diff --git a/examples/wifi/iperf/sdkconfig.ci.03 b/examples/wifi/iperf/sdkconfig.ci.03 index e169338fc6..b6a08a6871 100644 --- a/examples/wifi/iperf/sdkconfig.ci.03 +++ b/examples/wifi/iperf/sdkconfig.ci.03 @@ -1,7 +1,7 @@ CONFIG_MEMMAP_SMP=y CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 diff --git a/examples/wifi/iperf/sdkconfig.ci.04 b/examples/wifi/iperf/sdkconfig.ci.04 index 37b31ff7d6..7b3f9365dc 100644 --- a/examples/wifi/iperf/sdkconfig.ci.04 +++ b/examples/wifi/iperf/sdkconfig.ci.04 @@ -1,7 +1,7 @@ CONFIG_MEMMAP_SMP=y CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 diff --git a/examples/wifi/iperf/sdkconfig.ci.05 b/examples/wifi/iperf/sdkconfig.ci.05 index 5aa56680b3..f41b9b644c 100644 --- a/examples/wifi/iperf/sdkconfig.ci.05 +++ b/examples/wifi/iperf/sdkconfig.ci.05 @@ -1,7 +1,7 @@ CONFIG_MEMMAP_SMP=y CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 diff --git a/examples/wifi/iperf/sdkconfig.ci.06 b/examples/wifi/iperf/sdkconfig.ci.06 index 6d47f8f851..7d41e4e083 100644 --- a/examples/wifi/iperf/sdkconfig.ci.06 +++ b/examples/wifi/iperf/sdkconfig.ci.06 @@ -12,7 +12,7 @@ CONFIG_FREERTOS_UNICORE=y CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534 CONFIG_LWIP_TCP_WND_DEFAULT=65534 diff --git a/examples/wifi/iperf/sdkconfig.ci.07 b/examples/wifi/iperf/sdkconfig.ci.07 index 73842cba6e..aec0f64cd7 100644 --- a/examples/wifi/iperf/sdkconfig.ci.07 +++ b/examples/wifi/iperf/sdkconfig.ci.07 @@ -16,7 +16,7 @@ CONFIG_FREERTOS_UNICORE=n CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534 CONFIG_LWIP_TCP_WND_DEFAULT=65534 diff --git a/examples/wifi/iperf/sdkconfig.defaults b/examples/wifi/iperf/sdkconfig.defaults index 3b71c76f5e..e7f0fde749 100644 --- a/examples/wifi/iperf/sdkconfig.defaults +++ b/examples/wifi/iperf/sdkconfig.defaults @@ -6,7 +6,7 @@ CONFIG_FREERTOS_UNICORE=n CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n CONFIG_LWIP_IRAM_OPTIMIZATION=y diff --git a/examples/zigbee/light_sample/light_bulb/sdkconfig.defaults b/examples/zigbee/light_sample/light_bulb/sdkconfig.defaults index 4f82c3f28f..f64a202ac5 100644 --- a/examples/zigbee/light_sample/light_bulb/sdkconfig.defaults +++ b/examples/zigbee/light_sample/light_bulb/sdkconfig.defaults @@ -25,7 +25,6 @@ CONFIG_MBEDTLS_ECJPAKE_C=y # end of mbedTLS CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=n # # Zboss diff --git a/examples/zigbee/light_sample/light_switch/sdkconfig.defaults b/examples/zigbee/light_sample/light_switch/sdkconfig.defaults index 974931a889..be364384c7 100644 --- a/examples/zigbee/light_sample/light_switch/sdkconfig.defaults +++ b/examples/zigbee/light_sample/light_switch/sdkconfig.defaults @@ -25,7 +25,6 @@ CONFIG_MBEDTLS_ECJPAKE_C=y # end of mbedTLS CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n -CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=n # # Zboss diff --git a/tools/ldgen/samples/sdkconfig b/tools/ldgen/samples/sdkconfig index 07bc1260ab..3ac75fd8c1 100644 --- a/tools/ldgen/samples/sdkconfig +++ b/tools/ldgen/samples/sdkconfig @@ -161,7 +161,8 @@ CONFIG_ESP_SYSTEM_PANIC_GDBSTUB= CONFIG_ESP_DEBUG_OCDAWARE=y CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 -CONFIG_ESP_TASK_WDT=y +CONFIG_ESP_TASK_WDT_EN=y +CONFIG_ESP_TASK_WDT_INIT=y CONFIG_ESP_TASK_WDT_PANIC= CONFIG_ESP_TASK_WDT_TIMEOUT_S=5 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y diff --git a/tools/test_apps/system/longjmp_test/sdkconfig.defaults b/tools/test_apps/system/longjmp_test/sdkconfig.defaults index 23bffad44f..65f195bbe0 100644 --- a/tools/test_apps/system/longjmp_test/sdkconfig.defaults +++ b/tools/test_apps/system/longjmp_test/sdkconfig.defaults @@ -1,7 +1,7 @@ CONFIG_COMPILER_OPTIMIZATION_PERF=y CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y