Merge branch 'release/v4.1.0'

platformio · Jul 30, 2021 · a0c8666 · a0c8666
2 parents 06af7c2 + 744a1a5
commit a0c8666
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 104 deletions.
diff --git a/builder/main.py b/builder/main.py
@@ -85,6 +85,7 @@
 else:
     target_elf = env.BuildProgram()
     target_hex = env.ElfToHex(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
+    env.Depends(target_hex, "checkprogsize")
 
 AlwaysBuild(env.Alias("nobuild", target_hex))
 target_buildprog = env.Alias("buildprog", target_hex, target_hex)

diff --git a/platform.json b/platform.json
@@ -16,7 +16,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-sifive.git"
   },
-  "version": "4.0.0",
+  "version": "4.1.0",
   "frameworks": {
     "freedom-e-sdk": {
       "package": "framework-freedom-e-sdk",
@@ -52,107 +52,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.20500.0"
-    },
-    "framework-zephyr-canopennode": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.468d350028"
-    },
-    "framework-zephyr-civetweb": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.e6903b80c0"
-    },
-    "framework-zephyr-fatfs": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.1d1fcc725a"
-    },
-    "framework-zephyr-hal-st": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.b52fdbf4b6"
-    },
-    "framework-zephyr-libmetal": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.9d4ee2c3cf"
-    },
-    "framework-zephyr-lvgl": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.31acbaa36e"
-    },
-    "framework-zephyr-mbedtls": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.24d84ecff1"
-    },
-    "framework-zephyr-mcuboot": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.3fc59410b6"
-    },
-    "framework-zephyr-mcumgr": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.43845e883f"
-    },
-    "framework-zephyr-open-amp": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.de1b85a130"
-    },
-    "framework-zephyr-loramac-node": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.3f545d76a2"
-    },
-    "framework-zephyr-openthread": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.1d668284a0"
-    },
-    "framework-zephyr-segger": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.38c79a447e"
-    },
-    "framework-zephyr-sof": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.b5b772dd61"
-    },
-    "framework-zephyr-tinycbor": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.40daca97b4"
-    },
-    "framework-zephyr-tinycrypt": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.3e9a49d267"
-    },
-    "framework-zephyr-littlefs": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.9e4498d1c7"
-    },
-    "framework-zephyr-mipi-sys-t": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.75e671550a"
-    },
-    "framework-zephyr-tfm-mcuboot": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "1.7.0-rc1"
-    },
-    "framework-zephyr-trusted-firmware-m": {
-      "optional": true,
-      "owner": "platformio",
-      "version": "0.0.0-alpha+sha.96340fb6c0"
+      "version": "~2.20600.0"
     },
     "tool-openocd-riscv": {
       "optional": true,

diff --git a/platform.py b/platform.py
@@ -25,8 +25,7 @@ class SifivePlatform(PlatformBase):
     def configure_default_packages(self, variables, targets):
         if "zephyr" in variables.get("pioframework", []):
             for p in self.packages:
-                if p.startswith("framework-zephyr-") or p in (
-                        "tool-cmake", "tool-dtc", "tool-ninja"):
+                if p in ("tool-cmake", "tool-dtc", "tool-ninja"):
                     self.packages[p]["optional"] = False
             if "windows" not in get_systype():
                 self.packages["tool-gperf"]["optional"] = False