Free up RAM on the S2

Author: tannewt

ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults

@@ -39,6 +39,7 @@ CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y
 #
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4
 CONFIG_ESP_WIFI_RX_BA_WIN=4
+# CONFIG_ESP_WIFI_RX_IRAM_OPT is not set
 # end of Wi-Fi
 
 #

ports/espressif/esp-idf-config/sdkconfig.defaults

@@ -108,6 +108,7 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 #
 # CONFIG_SPI_FLASH_YIELD_DURING_ERASE is not set
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
+# CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE is not set
 # end of SPI Flash driver
 
 #

ports/espressif/supervisor/port.c

@@ -407,7 +407,7 @@ void reset_to_bootloader(void) {
 }
 
 void reset_cpu(void) {
-    #ifndef CONFIG_IDF_TARGET_ARCH_RISCV
+    #if CIRCUITPY_DEBUG
     esp_backtrace_print(100);
     #endif
     esp_restart();

ports/espressif/tools/update_sdkconfig.py

@@ -56,6 +56,7 @@
     "CONFIG_BT_CTRL_PINNED_TO_CORE",
     "CONFIG_SPIRAM_SPEED_2",
     "CONFIG_SPIRAM_BANKSWITCH_ENABLE",  # For ESP32
+    "CONFIG_ESP_WIFI_RX_IRAM_OPT",
 ]
 
 BOARD_SETTINGS = [
@@ -360,6 +361,11 @@ def update(debug, board, update_all):
                     target_kconfig_snippets.add(loc)
                     target_symbols = target_symbols.union(differing_keys)
 
+            # We treat SPIRAM differently so make sure it isn't a target related
+            # symbol (even though some targets don't support SPIRAM).
+            if "SPIRAM" in target_symbols:
+                target_symbols.remove("SPIRAM")
+
             # kconfig settings can be set by others. item.referenced doesn't
             # know this. So we collect all things that reference this using
             # rev_dep.
@@ -428,7 +434,9 @@ def update(debug, board, update_all):
                     # Always document the above settings. Settings below should
                     # be non-default.
                     pass
-                elif matches_group(config_string, PSRAM_SETTINGS) or psram_reference:
+                elif matches_group(config_string, PSRAM_SETTINGS) or (
+                    psram_reference and not target_setting
+                ):
                     print("  " * (len(current_group) + 1), "psram shared")
                     last_psram_group = add_group(psram_settings, last_psram_group, current_group)
                     psram_settings.append(config_string)