diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
index f2e8085d3e..4250aa45e3 100644
--- a/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
+++ b/ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig
@@ -1,11 +1,4 @@
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-# end of Partition Table
-
-#
+CONFIG_ESP32_SPIRAM_SUPPORT=y
 # SPI RAM config
 #
 # CONFIG_SPIRAM_TYPE_AUTO is not set
@@ -13,40 +6,22 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=2097152
-CONFIG_SPIRAM_SPEED_40M=y
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_MEMMAP=y
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-# CONFIG_SPIRAM_USE_MALLOC is not set
-CONFIG_SPIRAM_MEMTEST=y
-# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
-# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
-CONFIG_SPIRAM_CACHE_WORKAROUND=y
+# end of SPI RAM config
 
+# Uncomment to send log output to TX/RX pins on Feather ESP32V2
 #
-# SPI RAM config
+# ESP System Settings
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
-# CONFIG_SPIRAM_TYPE_AUTO is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-
-### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
-### #
-### # ESP System Settings
-### #
-### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
-### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
-### # CONFIG_ESP_CONSOLE_NONE is not set
-### CONFIG_ESP_CONSOLE_UART=y
-### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
-### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
-### CONFIG_ESP_CONSOLE_UART_NUM=0
-### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
-### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
-### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
-### # end of ESP System Settings
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP_CONSOLE_UART_CUSTOM=y
+# # CONFIG_ESP_CONSOLE_NONE is not set
+# CONFIG_ESP_CONSOLE_UART=y
+# nCONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
+# # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
+# CONFIG_ESP_CONSOLE_UART_NUM=0
+# CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
+# CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
+# CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+# # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
+# # end of ESP System Settings
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
index 6c244f3bbe..0b8efe48cd 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
@@ -1,3 +1,6 @@
+#
+# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+#
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_TARGET_ESP32=y
@@ -112,19 +115,6 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # end of Serial flasher config
 
-#
-# Partition Table
-#
-# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
-# CONFIG_PARTITION_TABLE_TWO_OTA is not set
-CONFIG_PARTITION_TABLE_CUSTOM=y
-# CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-# CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
-CONFIG_PARTITION_TABLE_OFFSET=0x8000
-CONFIG_PARTITION_TABLE_MD5=y
-# end of Partition Table
-
 #
 # Compiler options
 #
@@ -1081,7 +1071,6 @@ CONFIG_STACK_CHECK_NONE=y
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
 CONFIG_ADC2_DISABLE_DAC=y
-CONFIG_SPIRAM_SUPPORT=y
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_ULP_COPROC_ENABLED is not set
 CONFIG_ULP_COPROC_RESERVE_MEM=0