Drop support for abandoned Briki boards

platformio · Feb 16, 2024 · a7e7d01 · a7e7d01
1 parent 8fe5e12
commit a7e7d01
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 149 deletions.
diff --git a/boards/briki_abc_esp32.json b/boards/briki_abc_esp32.json
diff --git a/boards/briki_mbc-wb_esp32.json b/boards/briki_mbc-wb_esp32.json
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -32,12 +32,7 @@
 
 SConscript("_embed_files.py", exports="env")
 
-if build_core == "mbcwb":
-    SConscript(
-        join(DefaultEnvironment().PioPlatform().get_package_dir(
-            "framework-arduino-mbcwb"), "tools", "platformio-esp-build.py"))
-
-elif "espidf" not in env.subst("$PIOFRAMEWORK"):
+if "espidf" not in env.subst("$PIOFRAMEWORK"):
     SConscript(
         join(DefaultEnvironment().PioPlatform().get_package_dir(
             "framework-arduinoespressif32"), "tools", "platformio-build.py"))

diff --git a/builder/main.py b/builder/main.py
@@ -476,32 +476,6 @@ def __fetch_fs_size(target, source, env):
     ]
 
 
-elif upload_protocol == "mbctool":
-    env.Replace(
-        UPLOADER=join(
-            platform.get_package_dir("tool-mbctool") or "", "bin", "mbctool"),
-        UPLOADERFLAGS=[
-            "--device", "esp",
-            "--speed", "$UPLOAD_SPEED",
-            "--port", '"$UPLOAD_PORT"',
-            "--upload",
-            "0x1000", join(
-                platform.get_package_dir("framework-arduino-mbcwb"),
-                "tools", "sdk", "bin", "bootloader_qio_80m.bin"),
-            "0x8000", join("$BUILD_DIR", "partitions.bin"),
-            "0xe000", join(
-                platform.get_package_dir("framework-arduino-mbcwb"),
-                "tools", "partitions", "boot_app0.bin"),
-            "0x10000", join("$BUILD_DIR", "${PROGNAME}.bin"),
-        ],
-        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS'
-    )
-    upload_actions = [
-        env.VerboseAction(env.AutodetectUploadPort,
-                          "Looking for upload port..."),
-        env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")
-    ]
-
 elif upload_protocol == "dfu":
 
     hwids = board.get("build.hwids", [["0x2341", "0x0070"]])

diff --git a/platform.json b/platform.json
@@ -81,12 +81,6 @@
       "owner": "platformio",
       "version": "~3.20014.0"
     },
-    "framework-arduino-mbcwb": {
-      "type": "framework",
-      "optional": true,
-      "owner": "meteca",
-      "version": ">=2.1.1"
-    },
     "framework-espidf": {
       "type": "framework",
       "optional": true,
@@ -99,11 +93,6 @@
       "owner": "platformio",
       "version": "~1.40501.0"
     },
-    "tool-mbctool": {
-      "optional": true,
-      "owner": "meteca",
-      "version": ">=2.0.0"
-    },
     "tool-dfuutil-arduino": {
       "type": "uploader",
       "optional": true,

diff --git a/platform.py b/platform.py
@@ -139,29 +139,6 @@ def configure_default_packages(self, variables, targets):
             # RISC-V based toolchain for ESP32C3, ESP32C6 ESP32S2, ESP32S3 ULP
             self.packages["toolchain-riscv32-esp"]["optional"] = False
 
-        if build_core == "mbcwb":
-            # Remove the main toolchains from PATH
-            for toolchain in (
-                "toolchain-xtensa-esp32",
-                "toolchain-xtensa-esp32s2",
-                "toolchain-xtensa-esp32s3",
-                "toolchain-riscv32-esp",
-            ):
-                self.packages.pop(toolchain, None)
-
-            # Add legacy toolchain with specific version
-            self.packages["toolchain-xtensa32"] = {
-                "type": "toolchain",
-                "owner": "platformio",
-                "version": "~2.50200.0"
-            }
-
-            if build_core == "mbcwb":
-                self.packages["framework-arduinoespressif32"]["optional"] = True
-                self.packages["framework-arduino-mbcwb"]["optional"] = False
-                self.packages["tool-mbctool"]["type"] = "uploader"
-                self.packages["tool-mbctool"]["optional"] = False
-
         return super().configure_default_packages(variables, targets)
 
     def get_boards(self, id_=None):
@@ -184,7 +161,7 @@ def _add_dynamic_options(self, board):
 
         # debug tools
         debug = board.manifest.get("debug", {})
-        non_debug_protocols = ["esptool", "espota", "mbctool"]
+        non_debug_protocols = ["esptool", "espota"]
         supported_debug_tools = [
             "cmsis-dap",
             "esp-prog",