Improve logic for finding STM32Cube linker scripts

Author: valeros

boards/disco_h735ig.json

@@ -3,7 +3,7 @@
     "cpu": "cortex-m7",
     "extra_flags": "-DSTM32H7xx -DSTM32H735xx",
     "f_cpu": "550000000L",
-    "mcu": "stm32h735igk6u",
+    "mcu": "stm32h735igk6",
     "product_line": "STM32H735xx",
     "zephyr": {
        "variant": "stm32h735g_disco"

boards/olimexino_stm32f3.json

@@ -4,7 +4,7 @@
     "cpu": "cortex-m3",
     "extra_flags": "-DSTM32F303xC",
     "f_cpu": "72000000L",
-    "mcu": "stm32f303rct6tr",
+    "mcu": "stm32f303rct6",
     "variant": "STM32F3xx/F303R(B-C)T",
     "product_line": "STM32F303xC"
   },

boards/prntr_v2.json

@@ -7,7 +7,7 @@
     "framework_extra_flags": {
       "arduino": "-DVECT_TAB_OFFSET=0x8000 -DCUSTOM_PERIPHERAL_PINS"
     },
-    "mcu": "stm32f407re",
+    "mcu": "stm32f407vet6",
     "product_line": "STM32F407xx",
     "variant": "STM32F4xx/F407V(E-G)T_F417V(E-G)T"
   },

boards/st3dp001_eval.json

@@ -7,7 +7,7 @@
     "framework_extra_flags": {
       "arduino": "-DCUSTOM_PERIPHERAL_PINS"
     },
-    "mcu": "stm32f401vgt6",
+    "mcu": "stm32f401vet6",
     "product_line": "STM32F401xE",
     "variant": "STM32F4xx/F401V(B-C-D-E)T"
   },

builder/frameworks/stm32cube.py

@@ -22,13 +22,13 @@
 http://www.st.com/en/embedded-software/stm32cube-embedded-software.html?querycriteria=productId=LN1897
 """
 
-import glob
 import os
 import shutil
 import string
 import sys
+import re
 
-from SCons.Script import DefaultEnvironment
+from SCons.Script import ARGUMENTS, DefaultEnvironment
 
 from platformio.builder.tools.piolib import PlatformIOLibBuilder
 
@@ -72,25 +72,50 @@ def generate_ldscript(default_ldscript_path):
         fp.write(content)
 
 
-def get_linker_script(board_mcu):
-    ldscript_match = glob.glob(
-        os.path.join(
-            LDSCRIPTS_DIR, board_mcu[0:7], board_mcu[0:11].upper() + "*_FLASH.ld"
-        )
-    )
+def get_linker_script(board_mcu, board_cpu):
+    def _glob_re(pattern, ldscripts):
+        re_c = re.compile(pattern)
+        return list(filter(re_c.match, ldscripts))
 
-    if ldscript_match and os.path.isfile(ldscript_match[0]):
-        return ldscript_match[0]
+    if len(board_mcu) > 12:
+        board_mcu = board_mcu[:12] + "X" + board_mcu[13:]
 
-    default_ldscript = os.path.join(
-        LDSCRIPTS_DIR, board_mcu[0:7], board_mcu[0:11].upper() + "_DEFAULT.ld"
+    family_ldscripts_dir = os.path.join(LDSCRIPTS_DIR, board_mcu[0:7])
+
+    ldscript_matches = _glob_re(
+        "^%s.*_FLASH\\.ld$" % board_mcu.upper(),
+        os.listdir(family_ldscripts_dir),
     )
 
+    if ldscript_matches:
+        ldscript_file = ldscript_matches[0]
+        if len(ldscript_matches) > 1:
+            # Precise match with the CPU in filename has the highest priority
+            board_cpu = board_cpu.replace("cortex-", "").upper()
+            for match in ldscript_matches:
+                if board_cpu in match:
+                    ldscript_file = match
+                    break
+
+            if int(ARGUMENTS.get("PIOVERBOSE", 0)):
+                print(
+                    "Found suitable linker scripts: ["
+                    + ", ".join(ldscript_matches)
+                    + "], %s will be used!" % ldscript_file
+                )
+
+        return os.path.join(family_ldscripts_dir, ldscript_file)
+
+    # Fall back to an auto-generated linker script
     print(
         "Warning! Cannot find a linker script for the required board! "
         "An auto-generated script will be used to link firmware!"
     )
 
+    default_ldscript = os.path.join(
+        LDSCRIPTS_DIR, board_mcu[0:7], board_mcu[0:11].upper() + "_DEFAULT.ld"
+    )
+
     if not os.path.isfile(default_ldscript):
         generate_ldscript(default_ldscript)
 
@@ -252,7 +277,7 @@ def process_dsp_lib():
     ],
 
     LIBPATH=[
-        os.path.join(FRAMEWORK_DIR, "platformio", "ldscripts"),
+        os.path.join(LDSCRIPTS_DIR, MCU_FAMILY),
     ],
 
     LIBS=["c", "gcc", "m", "stdc++", "nosys"],
@@ -262,7 +287,8 @@ def process_dsp_lib():
 env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
 
 if not board.get("build.ldscript", ""):
-    env.Replace(LDSCRIPT_PATH=get_linker_script(board.get("build.mcu", "")))
+    env.Replace(LDSCRIPT_PATH=get_linker_script(
+        board.get("build.mcu", ""), board.get("build.cpu", "")))
 
 #
 # Process BSP components