From 5a7db65de827c307185f744a646fc95fa5719981 Mon Sep 17 00:00:00 2001
From: Valerii Koval <valeros08@gmail.com>
Date: Mon, 26 Dec 2022 14:32:12 +0200
Subject: [PATCH] Update ESP32 ULP toolchain to v2.35

ULP toolchain is now common for all family
---
 platform.json | 8 +-------
 platform.py   | 5 +----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/platform.json b/platform.json
index 5105773..07bb794 100644
--- a/platform.json
+++ b/platform.json
@@ -60,13 +60,7 @@
       "type": "toolchain",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.22851.0"
-    },
-    "toolchain-esp32s2ulp": {
-      "type": "toolchain",
-      "optional": true,
-      "owner": "platformio",
-      "version": "~1.22851.0"
+      "version": "~1.23500.0"
     },
     "framework-arduinoespressif32": {
       "type": "framework",
diff --git a/platform.py b/platform.py
index 4bbf708..a06b679 100644
--- a/platform.py
+++ b/platform.py
@@ -90,7 +90,7 @@ class Espressif32Platform(PlatformBase):
         if "espidf" in frameworks:
             # Common packages for IDF and mixed Arduino+IDF projects
             for p in self.packages:
-                if p in ("tool-cmake", "tool-ninja", "toolchain-%sulp" % mcu):
+                if p in ("tool-cmake", "tool-ninja", "toolchain-esp32ulp"):
                     self.packages[p]["optional"] = False
                 elif p in ("tool-mconf", "tool-idf") and IS_WINDOWS:
                     self.packages[p]["optional"] = False
@@ -102,9 +102,6 @@ class Espressif32Platform(PlatformBase):
                 self.packages.pop("toolchain-xtensa-%s" % available_mcu, None)
 
         if mcu in ("esp32s2", "esp32s3", "esp32c3"):
-            self.packages.pop("toolchain-esp32ulp", None)
-            if mcu != "esp32s2":
-                self.packages.pop("toolchain-esp32s2ulp", None)
             # RISC-V based toolchain for ESP32C3, ESP32S2, ESP32S3 ULP
             self.packages["toolchain-riscv32-esp"]["optional"] = False