summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2024-10-11 12:53:10 +1100
committerDamien George <damien@micropython.org>2024-10-11 12:53:10 +1100
commit44ed1c20ce070538068d9f708c8181e0be68fe55 (patch)
tree698c1100fc90e2272ec6bf735eb73ae98d61a5e4
parent82e69df33e379bf491bea647e217d6d56c5b8090 (diff)
esp32: Disable hardware stack protection on ESP32-C6.
The same as fee9d66e3a7308bd9edffb2624b52f4e04ecc4f3 but for C6. Fixes issue #15667. Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake1
-rw-r--r--ports/esp32/boards/M5STACK_NANOC6/mpconfigboard.cmake1
-rw-r--r--ports/esp32/boards/UM_TINYC6/mpconfigboard.cmake1
-rw-r--r--ports/esp32/boards/sdkconfig.c62
4 files changed, 5 insertions, 0 deletions
diff --git a/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake
index 4393130b6..3ab98e9da 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 4393130b6..3ab98e9da 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 dab33d13f..e2df716a1 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 000000000..18e8b75eb
--- /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