From 0090c3e9f1c48ac4820ec9d41f60566218a69c61 Mon Sep 17 00:00:00 2001
From: Mikhael Skvortsov <mikhael.skvortsov@gmail.com>
Date: Sat, 29 Mar 2025 08:06:01 +0300
Subject: [PATCH] Try remove quirks as possibly no longer needed

---
 bin/platformio-custom.py        | 17 -----------------
 src/platform/esp32/iram-quirk.c | 29 -----------------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 src/platform/esp32/iram-quirk.c

diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py
index fc10fb7a5..cb3521b28 100644
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -66,23 +66,6 @@ if platform.name == "espressif32":
 
     env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
 
-    esp32_kind = env.GetProjectOption("custom_esp32_kind")
-    if esp32_kind == "esp32":
-        # Free up some IRAM by removing auxiliary SPI flash chip drivers.
-        # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
-        env.Append(
-            LINKFLAGS=[
-                "-Wl,--wrap=esp_flash_chip_gd",
-                "-Wl,--wrap=esp_flash_chip_issi",
-                "-Wl,--wrap=esp_flash_chip_winbond",
-                # For IDF5 build
-                "-Wl,--wrap=abort",
-            ]
-        )
-    else:
-        # For newer ESP32 targets, using newlib nano works better.
-        env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
-
 if platform.name == "nordicnrf52":
     env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
                       env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
diff --git a/src/platform/esp32/iram-quirk.c b/src/platform/esp32/iram-quirk.c
deleted file mode 100644
index c0128ade3..000000000
--- a/src/platform/esp32/iram-quirk.c
+++ /dev/null
@@ -1,29 +0,0 @@
-// Free up some precious space in the iram0_0_seg memory segment
-
-#include <stdint.h>
-
-#include <esp_attr.h>
-#include <esp_flash.h>
-#include <esp_system.h>
-#include <spi_flash_chip_driver.h>
-
-#define IRAM_SECTION section(".iram1.stub")
-
-IRAM_ATTR esp_err_t stub_probe(esp_flash_t *chip, uint32_t flash_id)
-{
-    return ESP_ERR_NOT_FOUND;
-}
-
-const spi_flash_chip_t stub_flash_chip __attribute__((IRAM_SECTION)) = {
-    .name = "stub",
-    .probe = stub_probe,
-};
-
-extern const spi_flash_chip_t __wrap_esp_flash_chip_gd __attribute__((IRAM_SECTION, alias("stub_flash_chip")));
-extern const spi_flash_chip_t __wrap_esp_flash_chip_issi __attribute__((IRAM_SECTION, alias("stub_flash_chip")));
-extern const spi_flash_chip_t __wrap_esp_flash_chip_winbond __attribute__((IRAM_SECTION, alias("stub_flash_chip")));
-
-IRAM_ATTR __attribute__((noreturn)) void __wrap_abort(void)
-{
-    esp_system_abort("abort() was called");
-}
\ No newline at end of file