From 3a7ad642672a61d3adb1510bf26913376ff837c8 Mon Sep 17 00:00:00 2001
From: UnexpectedMaker <seon@unexpectedmaker.com>
Date: Thu, 30 Mar 2023 13:27:17 +1100
Subject: [PATCH] esp32/boards: Add some missing board configs for two UM
 boards.

---
 ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake | 3 ++-
 ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board     | 2 ++
 ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake       | 3 +++
 ports/esp32/boards/UM_TINYS2/sdkconfig.board           | 4 ++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
index b0b3e3aa99..c98ef69176 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
@@ -3,6 +3,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
+    boards/UM_FEATHERS2NEO/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
index 87a92892d0..556de1f8b4 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
@@ -3,6 +3,8 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
+CONFIG_SPIRAM_MEMTEST=
+
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2Neo"
 # end of LWIP
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
index e4b7b4a915..70cb4a814f 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -3,4 +3,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
+    boards/UM_TINYS2/sdkconfig.board
 )
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
index 48b6749c72..39a2a293ac 100644
--- a/ports/esp32/boards/UM_TINYS2/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
@@ -1,6 +1,10 @@
 CONFIG_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_USB_AND_UART=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS2"
 # end of LWIP