From bf780be81aff009e70520a2071a058a444ef6ac3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 22 Oct 2024 23:02:44 -0400 Subject: [PATCH 1/2] CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n for ESP32-C3 and ESP32-C6 --- ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults | 3 +++ ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults index bf9e57494c73..7718a705c784 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults @@ -46,4 +46,7 @@ CONFIG_NEWLIB_NANO_FORMAT=y # end of Component config +# Workaround for https://github.com/espressif/esp-idf/issues/14456 +CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n + # end of Espressif IoT Development Framework Configuration diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults index 85dde905f3ca..81df25182704 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults @@ -51,4 +51,7 @@ CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4 # end of Component config +# Workaround for https://github.com/espressif/esp-idf/issues/14456 +CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n + # end of Espressif IoT Development Framework Configuration From 9186420d3d4d002fbce2fb257cf8d44d5e10e1e5 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 23 Oct 2024 13:43:23 -0400 Subject: [PATCH 2/2] turn off CONFIG_ESP_SYSTEM_HW_STACK_GUARD for all builds --- ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults | 3 --- ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults | 3 --- ports/espressif/esp-idf-config/sdkconfig.defaults | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults index 7718a705c784..bf9e57494c73 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults @@ -46,7 +46,4 @@ CONFIG_NEWLIB_NANO_FORMAT=y # end of Component config -# Workaround for https://github.com/espressif/esp-idf/issues/14456 -CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n - # end of Espressif IoT Development Framework Configuration diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults index 81df25182704..85dde905f3ca 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults @@ -51,7 +51,4 @@ CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4 # end of Component config -# Workaround for https://github.com/espressif/esp-idf/issues/14456 -CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n - # end of Espressif IoT Development Framework Configuration diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 0fc26c165c76..ed914b98995a 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -39,6 +39,7 @@ CONFIG_PM_ENABLE=y # required for CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384 # CONFIG_ESP_TASK_WDT_INIT is not set # CONFIG_ESP_DEBUG_OCDAWARE is not set +# CONFIG_ESP_SYSTEM_HW_STACK_GUARD is not set # end of ESP System Settings