Merge branch 'release/v14.0.1'

platformio · Jun 29, 2021 · 645729a · 645729a
2 parents 3b7dfe1 + 7340c3e
commit 645729a
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 27 deletions.
diff --git a/boards/disco_l475vg_iot01a.json b/boards/disco_l475vg_iot01a.json
@@ -40,7 +40,7 @@
   ],
   "name": "ST B-L475E-IOT01A Discovery kit",
   "upload": {
-    "maximum_ram_size": 131072,
+    "maximum_ram_size": 98304,
     "maximum_size": 1048576,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/nucleo_l452re.json b/boards/nucleo_l452re.json
@@ -31,8 +31,8 @@
   ],
   "name": "ST Nucleo L452RE",
   "upload": {
-    "maximum_ram_size": 65536,
-    "maximum_size": 262144,
+    "maximum_ram_size": 163840,
+    "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [
       "jlink",

diff --git a/boards/nucleo_l476rg.json b/boards/nucleo_l476rg.json
@@ -33,7 +33,7 @@
   ],
   "name": "ST Nucleo L476RG",
   "upload": {
-    "maximum_ram_size": 131072,
+    "maximum_ram_size": 98304,
     "maximum_size": 1048576,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/nucleo_l496zg.json b/boards/nucleo_l496zg.json
@@ -33,7 +33,7 @@
   ],
   "name": "ST Nucleo L496ZG",
   "upload": {
-    "maximum_ram_size": 131072,
+    "maximum_ram_size": 327680,
     "maximum_size": 1048576,
     "protocol": "stlink",
     "protocols": [

diff --git a/boards/vccgnd_f407zg_mini.json b/boards/vccgnd_f407zg_mini.json
@@ -13,7 +13,7 @@
   },
   "debug": {
     "jlink_device": "STM32F407ZG",
-    "openocd_target": "stm32f1x",
+    "openocd_target": "stm32f4x",
     "svd_path": "STM32F407xx.svd"
   },
   "frameworks": [

diff --git a/builder/frameworks/libopencm3 b/builder/frameworks/libopencm3
diff --git a/builder/frameworks/spl.py b/builder/frameworks/spl.py
@@ -62,16 +62,17 @@ def get_linker_script(mcu):
     with open(template_file) as fp:
         data = Template(fp.read())
         content = data.substitute(
-            stack=hex(0x20000000 + ram), # 0x20000000 - start address for RAM
-            ram=str(int(ram/1024)) + "K",
-            flash=str(int(flash/1024)) + "K"
+            stack=hex(0x20000000 + ram),  # 0x20000000 - start address for RAM
+            ram=str(int(ram / 1024)) + "K",
+            flash=str(int(flash / 1024)) + "K"
         )
 
     with open(default_ldscript, "w") as fp:
         fp.write(content)
 
     return default_ldscript
 
+
 env.Append(
     CPPPATH=[
         join(FRAMEWORK_DIR, board.get("build.core"),
@@ -82,6 +83,9 @@ def get_linker_script(mcu):
              "variants", board.get("build.mcu")[0:7], "inc"),
         join(FRAMEWORK_DIR, board.get("build.core"), "spl",
              "variants", board.get("build.mcu")[0:7], "src")
+    ],
+    LINKFLAGS=[
+        "-nostartfiles"
     ]
 )
 

diff --git a/builder/frameworks/stm32cube.py b/builder/frameworks/stm32cube.py
@@ -137,6 +137,8 @@ def generate_hal_config_file():
 
 
 def build_custom_lib(lib_path, lib_manifest=None):
+    if not os.path.isdir(lib_path):
+        return
     if board.get("build.stm32cube.disable_embedded_libs", "no") == "yes":
         return
     if lib_path:
@@ -255,8 +257,9 @@ def build_usb_libs(usb_libs_root):
 
 bsp_dir = os.path.join(FRAMEWORK_DIR, "Drivers", "BSP")
 components_dir = os.path.join(bsp_dir, "Components")
-for component in os.listdir(components_dir):
-    build_custom_lib(os.path.join(components_dir, component))
+if os.path.isdir(components_dir):
+    for component in os.listdir(components_dir):
+        build_custom_lib(os.path.join(components_dir, component))
 
 if os.path.isdir(os.path.join(bsp_dir, "Adafruit_Shield")):
     build_custom_lib(os.path.join(bsp_dir, "Adafruit_Shield"))
@@ -266,19 +269,25 @@ def build_usb_libs(usb_libs_root):
 #
 
 utils_dir = os.path.join(FRAMEWORK_DIR, "Utilities")
-for util in os.listdir(utils_dir):
-    util_dir = os.path.join(utils_dir, util)
-    # Some of utilities is not meant to be built
-    if not any(f.endswith((".c", ".h")) for f in os.listdir(util_dir)):
-        continue
-    build_custom_lib(
-        os.path.join(utils_dir, util),
-        {
-            "name": "Util-%s" % util,
-            "dependencies": [{"name": "FrameworkVariantBSP"}],
-            "build": {"flags": ["-I $PROJECT_SRC_DIR", "-I $PROJECT_INCLUDE_DIR"], "libLDFMode": "deep"},
-        },
-    )
+if os.path.isdir(utils_dir):
+    for util in os.listdir(utils_dir):
+        util_dir = os.path.join(utils_dir, util)
+        # Some of utilities is not meant to be built
+        if not os.path.isdir(util_dir) or not any(
+            f.endswith((".c", ".h")) for f in os.listdir(util_dir)
+        ):
+            continue
+        build_custom_lib(
+            os.path.join(utils_dir, util),
+            {
+                "name": "Util-%s" % util,
+                "dependencies": [{"name": "FrameworkVariantBSP"}],
+                "build": {
+                    "flags": ["-I $PROJECT_SRC_DIR", "-I $PROJECT_INCLUDE_DIR"],
+                    "libLDFMode": "deep",
+                },
+            },
+        )
 
 #
 # USB libraries from ST

diff --git a/builder/main.py b/builder/main.py
@@ -305,7 +305,7 @@ def __configure_upload_port(env):
     ]
     openocd_args.extend(
         debug_tools.get(upload_protocol).get("server").get("arguments", []))
-    if env.GetProjectOption("debug_speed"):
+    if env.GetProjectOption("debug_speed", ""):
         openocd_args.extend(
             ["-c", "adapter speed %s" % env.GetProjectOption("debug_speed")]
         )

diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-ststm32.git"
   },
-  "version": "14.0.0",
+  "version": "14.0.1",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",