From 44ed1c20ce070538068d9f708c8181e0be68fe55 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 11 Oct 2024 12:53:10 +1100 Subject: [PATCH] esp32: Disable hardware stack protection on ESP32-C6. The same as fee9d66e3a7308bd9edffb2624b52f4e04ecc4f3 but for C6. Fixes issue #15667. Signed-off-by: Damien George --- ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake | 1 + ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake | 1 + ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake | 1 + ports/esp32/boards/sdkconfig.c6 | 2 ++ 4 files changed, 5 insertions(+) create mode 100644 ports/esp32/boards/sdkconfig.c6 diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake index 4393130b61..3ab98e9da1 100644 --- a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake +++ b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake @@ -3,5 +3,6 @@ set(IDF_TARGET esp32c6) set(SDKCONFIG_DEFAULTS boards/sdkconfig.base ${SDKCONFIG_IDF_VERSION_SPECIFIC} + boards/sdkconfig.c6 boards/sdkconfig.ble ) diff --git a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake index 4393130b61..3ab98e9da1 100644 --- a/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake +++ b/ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake @@ -3,5 +3,6 @@ set(IDF_TARGET esp32c6) set(SDKCONFIG_DEFAULTS boards/sdkconfig.base ${SDKCONFIG_IDF_VERSION_SPECIFIC} + boards/sdkconfig.c6 boards/sdkconfig.ble ) diff --git a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake index dab33d13f0..e2df716a16 100644 --- a/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake +++ b/ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake @@ -3,6 +3,7 @@ set(IDF_TARGET esp32c6) set(SDKCONFIG_DEFAULTS boards/sdkconfig.base ${SDKCONFIG_IDF_VERSION_SPECIFIC} + boards/sdkconfig.c6 boards/sdkconfig.ble boards/UM_TINYC6/sdkconfig.board ) diff --git a/ports/esp32/boards/sdkconfig.c6 b/ports/esp32/boards/sdkconfig.c6 new file mode 100644 index 0000000000..18e8b75eb4 --- /dev/null +++ b/ports/esp32/boards/sdkconfig.c6 @@ -0,0 +1,2 @@ +# Workaround for https://github.com/espressif/esp-idf/issues/14456 +CONFIG_ESP_SYSTEM_HW_STACK_GUARD=n