Merge branch 'release/v4.3.0'

Author: ivankravets

.travis.yml

@@ -25,6 +25,7 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/spl-blink
   - PLATFORMIO_PROJECT_DIR=examples/stm32cube-hal-blink
   - PLATFORMIO_PROJECT_DIR=examples/stm32cube-ll-blink
+  - PLATFORMIO_PROJECT_DIR=tests/mbed-filesystem
 
 install:
   - pip install -U https://github.com/platformio/platformio/archive/develop.zip

appveyor.yml

@@ -24,6 +24,7 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/spl-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/stm32cube-hal-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/stm32cube-ll-blink"
+    - PLATFORMIO_PROJECT_DIR: "tests/mbed-filesystem"
 
 install:
   - cmd: git submodule update --init --recursive

boards/disco_f407vg.json

@@ -20,6 +20,7 @@
     "svd_path": "STM32F40x.svd"
   },
   "frameworks": [
+    "arduino",
     "mbed",
     "cmsis",
     "spl",

boards/genericSTM32F407VET6.json

@@ -2,15 +2,19 @@
   "build": {
     "core": "stm32",
     "cpu": "cortex-m4",
-    "extra_flags": "-mthumb -DSTM32F4 -DSTM32_HIGH_DENSITY",
+    "extra_flags": "-DSTM32F407xx",
     "f_cpu": "168000000L",
     "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
       [
         "0x0483",
         "0x3748"
       ]
     ],
-    "ldscript": "jtag.ld",
+    "ldscript": "stm32f407xe.ld",
     "mcu": "stm32f407vet6",
     "variant": "stm32f4"
   },
@@ -37,16 +41,22 @@
     }
   },
   "frameworks": [
-    "arduino"
+    "arduino",
+    "stm32cube"
   ],
   "name": "STM32F407VE (192k RAM. 512k Flash)",
   "upload": {
+    "disable_flushing": false,
     "maximum_ram_size": 131072,
     "maximum_size": 514288,
     "protocol": "stlink",
     "protocols": [
-      "stlink"
-    ]
+      "stlink",
+      "dfu"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
   },
   "url": "http://www.st.com/en/microcontrollers/stm32f407ve.html",
   "vendor": "Generic"

builder/frameworks/arduino/maple/stm32f4.py

@@ -35,48 +35,53 @@
 assert isdir(FRAMEWORK_DIR)
 
 # default configuration values
+vector = int(board.get("build.vec_tab_addr", "0x8000000"), 16)
 error_led_port = "GPIOA"
 error_led_pin = 7
+ldscript = "jtag.ld"
+board_type = "discovery_f4"
 
 # remap board configuration values
 mcu_type = board.get("build.mcu")[:-2]
-if "stm32f407ve" in mcu_type:
-    ldscript = "jtag.ld"
+if "f407ve" in mcu_type:
     variant = "generic_f407v"
-
+    board_type = "generic_f407v"
+elif "f407vg" in mcu_type:
+    error_led_port = "GPIOD"
+    error_led_pin = 14
+    variant = "discovery_f407"
 
 # upload related configuration remap
-# for all generic boards
 upload_protocol = env.subst("$UPLOAD_PROTOCOL")
 
+if upload_protocol == "dfu":
+    vector = 0x8004000
+    if "f407v" in mcu_type:
+        ldscript = "bootloader_8004000.ld"
+
 env.Append(
-    CFLAGS=[
-        "-std=gnu11"
-    ],
+    CFLAGS=["-std=gnu11"],
+
+    CXXFLAGS=["-std=gnu++11"],
 
     CCFLAGS=[
         "-MMD",
-        "--param",
-        "max-inline-insns-single=500"
-    ],
-
-    CXXFLAGS=[
-        "-std=gnu++11"
+        "--param", "max-inline-insns-single=500",
     ],
 
     CPPDEFINES=[
         ("DEBUG_LEVEL", "DEBUG_NONE"),
-        ("BOARD_%s" % variant),
+        ("BOARD_%s" % board_type),
         ("ERROR_LED_PORT", error_led_port),
         ("ERROR_LED_PIN", error_led_pin),
         ("ARDUINO", 10610),
         ("ARDUINO_%s" % variant.upper()),
         ("ARDUINO_ARCH_STM32F4"),
         ("VECT_TAB_FLASH"),
-        ("USER_ADDR_ROM=0x08000000"),
+        ("USER_ADDR_ROM", vector),
         ("__STM32F4__"),
-        ("MCU_%s" % mcu_type.upper()),
-        ("SERIAL_USB") # this is so that usb serial is connected when the board boots, use USB_MSC for having USB Mass Storage (MSC) instead
+        ("STM32_HIGH_DENSITY"),
+        ("USB_NC")
     ],
 
     CPPPATH=[
@@ -88,9 +93,7 @@
         join(FRAMEWORK_DIR, "system", "libmaple"),
     ],
 
-    LIBPATH=[join(FRAMEWORK_DIR, "variants", variant, "ld")],
-
-    LIBS=["c"]
+    LIBPATH=[join(FRAMEWORK_DIR, "variants", variant, "ld")]
 )
 
 # remap ldscript
@@ -102,10 +105,14 @@
         env['LINKFLAGS'].remove(item)
 
 # remove unused libraries
-for item in ("stdc++", "nosys"):
+for item in ("c", "stdc++", "nosys"):
     if item in env['LIBS']:
         env['LIBS'].remove(item)
 
+# remove USB inactive serial flag if other flags are used
+if "SERIAL_USB" in env['CPPDEFINES'] or "USB_MSC" in env['CPPDEFINES']:
+    env['CPPDEFINES'].remove("USB_NC")
+
 #
 # Lookup for specific core's libraries
 #

builder/frameworks/mbed

@@ -24,6 +24,7 @@
 """
 
 from os.path import isdir, isfile, join
+from string import Template
 
 from SCons.Script import DefaultEnvironment
 
@@ -33,6 +34,40 @@
 FRAMEWORK_DIR = platform.get_package_dir("framework-spl")
 assert isdir(FRAMEWORK_DIR)
 
+def get_linker_script(mcu):
+    ldscript = join(FRAMEWORK_DIR, "platformio",
+                    "ldscripts", mcu[0:11].upper() + "_FLASH.ld")
+
+    if isfile(ldscript):
+        return ldscript
+
+    default_ldscript = join(FRAMEWORK_DIR, "platformio",
+                            "ldscripts", mcu[0:11].upper() + "_DEFAULT.ld")
+
+    print("Warning! Cannot find a linker script for the required board! "
+          "Firmware will be linked with a default linker script!")
+
+    if isfile(default_ldscript):
+        return default_ldscript
+
+    ram = env.BoardConfig().get("upload.maximum_ram_size", 0)
+    flash = env.BoardConfig().get("upload.maximum_size", 0)
+    template_file = join(FRAMEWORK_DIR, "platformio",
+                         "ldscripts", "tpl", "linker.tpl")
+    content = ""
+    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"
+        )
+
+    with open(default_ldscript, "w") as fp:
+        fp.write(content)
+
+    return default_ldscript
+
 env.Append(
     CPPPATH=[
         join(FRAMEWORK_DIR, env.BoardConfig().get("build.core"),
@@ -52,26 +87,14 @@
     ]
 )
 
+env.Replace(
+    LDSCRIPT_PATH=get_linker_script(env.BoardConfig().get("build.mcu"))
+)
+
 #
 # Target: Build SPL Library
 #
 
-# use mbed ldscript with bootloader section
-ldscript = env.BoardConfig().get("build.ldscript")
-if not isfile(join(platform.get_dir(), "ldscripts", ldscript)):
-    if "mbed" in env.BoardConfig().get("frameworks", []):
-        env.Append(
-            LINKFLAGS=[
-                '-Wl,-T"%s"' %
-                join(
-                    platform.get_package_dir("framework-mbed"), "targets",
-                    "TARGET_STM", "TARGET_%s" % env.BoardConfig().get("build.variant")[:7],
-                    "TARGET_%s" % env.subst("$BOARD").upper(), "device",
-                    "TOOLCHAIN_GCC_ARM", "%s.ld" % ldscript.upper()[:-3]
-                )
-            ]
-        )
-
 extra_flags = env.BoardConfig().get("build.extra_flags", "")
 src_filter_patterns = ["+<*>"]
 if "STM32F40_41xxx" in extra_flags:

builder/frameworks/spl.py

@@ -44,7 +44,8 @@
     "stm32f103r8": "startup_stm32f103xb.s",
     "stm32f103rc": "startup_stm32f103xb.s",
     "stm32f103vc": "startup_stm32f103xe.s",
-    "stm32f103ve": "startup_stm32f103xe.s"
+    "stm32f103ve": "startup_stm32f103xe.s",
+    "stm32f407ve": "startup_stm32f407xx.s"
 }
 
 

builder/frameworks/stm32cube.py

@@ -64,6 +64,9 @@
 
     LIBS=["c", "gcc", "m", "stdc++", "nosys"],
 
+    SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*",
+    SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+(\d+).*",
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
     SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
 
     PROGSUFFIX=".elf"
@@ -196,7 +199,7 @@ def __configure_upload_port(env):
         __configure_upload_port=__configure_upload_port,
         UPLOADER=_upload_tool,
         UPLOADERFLAGS=["${__configure_upload_port(__env__)}"] + _upload_flags,
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS $PROJECT_DIR/$SOURCES"
+        UPLOADCMD='$UPLOADER $UPLOADERFLAGS "$PROJECT_DIR/$SOURCES"'
     )
     upload_actions = [
         env.VerboseAction(env.AutodetectUploadPort, "Looking for upload port..."),

builder/main.py

@@ -17,7 +17,7 @@ platform = ststm32
 framework = arduino
 board = maple
 
-[env:genericSTM32F103RB]
+[env:generic STM32F103RB]
 platform = ststm32
 framework = arduino
 board = genericSTM32F103RB