wip; change never-ever reset pin mechanism

dhalbert · dhalbert · commit 780c4963cb7a · 2022-06-28T23:06:49.000-04:00
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
@@ -247,7 +247,6 @@ SRC_C += \
 	bindings/espidf/__init__.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
-	modules/$(CIRCUITPY_MODULE).c \
 	shared/netutils/netutils.c \
 	peripherals/i2c.c \
 	peripherals/rmt.c \
diff --git a/ports/espressif/README.rst b/ports/espressif/README.rst
@@ -9,6 +9,7 @@ Support Status:
 .. csv-table::
     :header: SoC, Status
 
+    ESP, "beta"
     ESP32-C3, "beta"
     ESP32-S2, "stable"
     ESP32-S3, "beta"
@@ -20,13 +21,17 @@ How this port is organized:
 - **boards/** contains the configuration files for each development board and breakout available on the port.
 - **common-hal/** contains the port-specific module implementations, used by shared-module and shared-bindings.
 - **esp-idf/** contains the Espressif IoT Development Framework installation, including all the drivers for the port.
-- **modules/** contains information specific to certain Espressif SoC based hardware modules, such as the pins used for flash and RAM on the WROVER and WROOM.
 - **peripherals/** contains peripheral setup files and peripheral mapping information, sorted by family and sub-variant. Most files in this directory can be generated with the python scripts in **tools/**.
 - **supervisor/** contains port-specific implementations of internal flash, serial and USB, as well as the **port.c** file, which initializes the port at startup.
 - **tools/** includes useful Python scripts for debugging and other purposes.
 
 At the root level, refer to **mpconfigboard.h** and **mpconfigport.mk** for port specific settings and a list of enabled CircuitPython modules.
 
+Connecting to the ESP32
+---------------------------------------
+The ESP32 chip itself has no USB support. On many boards there is a USB-serial adapter chip, such as a CP2102N, CP2104 or CH9102F, usually connected to the ESP32 TXD0 (GPIO1)and RXD0 (GPIO3) pins, for access to the bootloader. CircuitPython also uses this serial channel for the REPL.
+
+
 Connecting to the ESP32-C3
 ---------------------------------------
 
diff --git a/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk b/ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk
@@ -14,4 +14,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
 
-CIRCUITPY_MODULE = esp32_pico_mini_02
+CIRCUITPY_ESP_PSRAM = 1
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk
@@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s3_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk
@@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s3_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
@@ -17,4 +17,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
@@ -18,7 +18,7 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_BITBANG_APA102 = 1
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
 
 # Include these Python libraries in firmware.
 # FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
@@ -18,4 +18,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wroom
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -16,4 +16,4 @@ CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-CIRCUITPY_MODULE = esp32s2_wrover
+CIRCUITPY_ESP_PSRAM = 0
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -40,6 +40,73 @@
 STATIC uint32_t never_reset_pins[2];
 STATIC uint32_t in_use[2];
 
+// Bit mask of all pins that should never ever be reset.
+// Typically these are SPI flash and PSRAM control pins, and communication pins.
+static const uint64_t pin_mask_reset_forbidden =
+    #if defined(CONFIG_IDF_TARGET_ESP32)
+    // Never ever reset serial pins for bootloader and possibly USB-serial converter.
+    GPIO_SEL_1 |          // TXD0
+    GPIO_SEL_3 |          // RXD0
+    // Never ever reset pins used to communicate with SPI flash and PSRAM.
+    GPIO_SEL_6 |          // CLK
+    GPIO_SEL_9 |          // (PSRAM) SD2
+    GPIO_SEL_10 |         // (PSRAM) SD3
+    GPIO_SEL_11 |         // CMD
+    GPIO_SEL_16 |         // SPIHD
+    GPIO_SEL_17 |         // SPIDO
+    GPIO_SEL_18 |         // SPIWP
+    GPIO_SEL_23 |         // SPIDI
+    #endif // ESP32
+
+    #if defined(CONFIG_IDF_TARGET_ESP32C3)
+    // Never ever reset pins used to communicate with SPI flash.
+    GPIO_SEL_11 |         // VDD_SPI
+    GPIO_SEL_12 |         // SPIHD
+    GPIO_SEL_13 |         // SPIWP
+    GPIO_SEL_14 |         // SPICS0
+    GPIO_SEL_15 |         // SPICLK
+    GPIO_SEL_16 |         // SPID
+    GPIO_SEL_17 |         // SPIQ
+    #if CIRCUITPY_ESP_USB_SERIAL_JTAG
+    // Never ever reset serial/JTAG communication pins.
+    GPIO_SEL_18 |         // USB D-
+    GPIO_SEL_19 |         // USB D+
+    #endif
+    #endif // ESP32C3
+
+    #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
+    // Never ever reset pins used to communicate with SPI flash and PSRAM.
+    GPIO_SEL_19 |         // USB D-
+    GPIO_SEL_20 |         // USB D+
+    #if CIRCUITPY_ESP_PSRAM
+    // Board uses PSRAM, and needs another chip select.
+    GPIO_SEL_26 |         // SPICS1
+    #endif
+    GPIO_SEL_27 |         // SPIHD
+    GPIO_SEL_28 |         // SPIWP
+    GPIO_SEL_29 |         // SPICS0
+    GPIO_SEL_30 |         // SPICLK
+    GPIO_SEL_31 |         // SPIHD
+    GPIO_SEL_32 |         // SPIQ
+    #if defined(CONFIG_SPIRAM_MODE_OCT)
+    // Never reset octal SPI flash pins DQ4-DQ7 and DQS/DM.
+    GPIO_SEL_33 |         // SPIIO4
+    GPIO_SEL_34 |         // SPIIO5
+    GPIO_SEL_35 |         // SPIIO6
+    GPIO_SEL_36 |         // SPIIO7
+    GPIO_SEL_37 |         // SPIDQS
+    #endif
+    #if CIRCUITPY_USB
+    // Never ever reset USB pins.
+    GPIO_SEL_19 |         // USB D-
+    GPIO_SEL_20 |         // USB D+
+    #endif
+    #endif // ESP32S2, ESP32S3
+
+    0;                    // Terminate last "|".
+
+
+
 void never_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == NO_PIN) {
         return;
@@ -59,40 +126,10 @@ MP_WEAK bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
 }
 
 STATIC void _reset_pin(gpio_num_t pin_number) {
-   // Never ever reset pins used for flash and RAM.
-    #if defined(CONFIG_IDF_TARGET_ESP32)
-    if (pin_number == 1 || pin_number == 6 || pin_number == 11 || pin_number == 9 || pin_number == 10 || pin_number == 17 || pin_number == 23) {
+    // Never ever reset pins used for flash, RAM, and basic communication.
+    if (pin_mask_reset_forbidden & (((uint64_t)1) << pin_number)) {
         return;
     }
-    #elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
-    // Never ever reset pins used for flash and RAM.
-    if (26 <= pin_number && pin_number <= 32) {
-        return;
-    }
-    #ifdef CONFIG_SPIRAM_MODE_OCT
-    // Octal DQ4-DQ7 and DQS/DM
-    if (33 <= pin_number && pin_number <= 37) {
-        return;
-    }
-    #endif
-
-    #if CIRCUITPY_USB
-    // Never reset USB pins.
-    if (pin_number == 19 || pin_number == 20) {
-        return;
-    }
-    #endif
-    #elif defined(CONFIG_IDF_TARGET_ESP32C3)
-    // Never ever reset pins used for flash and RAM.
-    if (11 <= pin_number && pin_number <= 17) {
-        return;
-    }
-    #if CIRCUITPY_ESP_USB_SERIAL_JTAG
-    if (pin_number == 18 || pin_number == 19) {
-        return;
-    }
-    #endif
-    #endif
 
     // Give the board a chance to reset the pin in a particular way.
     if (espressif_board_reset_pin_number(pin_number)) {
diff --git a/ports/espressif/modules/esp32_pico_mini_02.c b/ports/espressif/modules/esp32_pico_mini_02.c
diff --git a/ports/espressif/modules/esp32s2_wroom.c b/ports/espressif/modules/esp32s2_wroom.c
diff --git a/ports/espressif/modules/esp32s2_wrover.c b/ports/espressif/modules/esp32s2_wrover.c
diff --git a/ports/espressif/modules/esp32s3_wroom.c b/ports/espressif/modules/esp32s3_wroom.c
diff --git a/ports/espressif/modules/esp32s3_wrover.c b/ports/espressif/modules/esp32s3_wrover.c
diff --git a/ports/espressif/modules/module.h b/ports/espressif/modules/module.h
diff --git a/ports/espressif/modules/none.c b/ports/espressif/modules/none.c
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
