From a0a7209229ff92f74c46809ca61ca707b4bf99e4 Mon Sep 17 00:00:00 2001
From: Austin Lane <vidplace7@gmail.com>
Date: Sat, 25 Apr 2026 14:29:36 -0400
Subject: [PATCH] Use mverch's iram_memset hack for all OG-ESP32

---
 variants/esp32/esp32.ini            | 4 ++++
 variants/esp32/tbeam/platformio.ini | 8 +-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/variants/esp32/esp32.ini b/variants/esp32/esp32.ini
index 201669bee..50b475a6c 100644
--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -12,6 +12,9 @@ build_src_filter =
 build_flags =
   ${esp32_common.build_flags}
   -mtext-section-literals
+  -D ESP32_FORCE_IRAM_MEMSET
+  -Wl,--wrap=memset
+  -Wl,--wrap=memcpy
   -DMESHTASTIC_EXCLUDE_AUDIO=1
   -DMESHTASTIC_EXCLUDE_ACCELEROMETER=1
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
@@ -37,6 +40,7 @@ custom_sdkconfig =
   '# CONFIG_BTDM_CTRL_MODE_BTDM is not set'
   '# CONFIG_BT_BLUEDROID_ENABLED is not set'
   CONFIG_BT_NIMBLE_ENABLED=y
+  CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y
 
 ; Override lib_deps to use environmental_extra_no_bsec instead of environmental_extra
 ; BSEC library uses ~3.5KB DRAM which causes overflow on original ESP32 targets
diff --git a/variants/esp32/tbeam/platformio.ini b/variants/esp32/tbeam/platformio.ini
index 4371dcc63..b1367df87 100644
--- a/variants/esp32/tbeam/platformio.ini
+++ b/variants/esp32/tbeam/platformio.ini
@@ -16,14 +16,8 @@ board_check = true
 build_flags = ${esp32_base.build_flags}
   -D TBEAM_V10
   -I variants/esp32/tbeam
-  -D ESP32_FORCE_IRAM_MEMSET
-  -Wl,--wrap=memset
-  -Wl,--wrap=memcpy
-upload_speed = 921600
 
-custom_sdkconfig =
-    ${esp32_base.custom_sdkconfig}
-    CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y
+upload_speed = 921600
 
 [env:tbeam-displayshield]
 extends = env:tbeam