Refactor build scripts for development platforms

platformio/builder/scripts/stm32.py

@@ -8,63 +8,14 @@
 
 from os.path import join
 
-from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
-                          DefaultEnvironment)
+from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default,
+                          DefaultEnvironment, SConscript)
 
 env = DefaultEnvironment()
+env = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")),
+                 exports="env")
 
 env.Replace(
-    AR="arm-none-eabi-ar",
-    AS="arm-none-eabi-gcc",
-    CC="arm-none-eabi-gcc",
-    CXX="arm-none-eabi-g++",
-    OBJCOPY="arm-none-eabi-objcopy",
-    RANLIB="arm-none-eabi-ranlib",
-    SIZETOOL="arm-none-eabi-size",
-
-    ARFLAGS=["rcs"],
-
-    ASFLAGS=[
-        "-c",
-        "-g",  # include debugging info (so errors include line numbers)
-        "-x", "assembler-with-cpp",
-        "-Wall",
-        "-mthumb",
-        "-mcpu=${BOARD_OPTIONS['build']['mcu']}"
-    ],
-
-    CCFLAGS=[
-        "-g",   # include debugging info (so errors include line numbers)
-        "-Os",  # optimize for size
-        "-ffunction-sections",  # place each function in its own section
-        "-fdata-sections",
-        "-Wall",
-        "-mthumb",
-        "-mcpu=${BOARD_OPTIONS['build']['mcu']}",
-        "-MMD"  # output dependancy info
-    ],
-
-    CXXFLAGS=[
-        "-fno-rtti",
-        "-fno-exceptions"
-    ],
-
-    CPPDEFINES=[
-        "F_CPU=$BOARD_F_CPU",
-        "${BOARD_OPTIONS['build']['variant'].upper()}"
-    ],
-
-    LINKFLAGS=[
-        "-Os",
-        "-nostartfiles",
-        "-nostdlib",
-        "-Wl,--gc-sections",
-        "-mthumb",
-        "-mcpu=${BOARD_OPTIONS['build']['mcu']}"
-    ],
-
-    SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES',
-
     UPLOADER=join("$PIOPACKAGES_DIR", "tool-stlink", "st-flash"),
     UPLOADERFLAGS=[
         "write",        # write in flash
@@ -75,37 +26,16 @@ env.Replace(
     UPLOADCMD="$UPLOADER $UPLOADERFLAGS"
 )
 
-if env.get("BOARD_OPTIONS", {}).get("build", {}).get("mcu")[-2:] == "m4":
-    env.Append(
-        ASFLAGS=[
-            "-mfloat-abi=hard",
-            "-mfpu=fpv4-sp-d16",
-            "-fsingle-precision-constant"
-        ],
-        CCFLAGS=[
-            "-mfloat-abi=hard",
-            "-mfpu=fpv4-sp-d16",
-            "-fsingle-precision-constant"
-        ],
-        LINKFLAGS=[
-            "-mfloat-abi=hard",
-            "-mfpu=fpv4-sp-d16",
-            "-fsingle-precision-constant"
-        ]
-    )
 
 env.Append(
-    BUILDERS=dict(
-        ElfToBin=Builder(
-            action=" ".join([
-                "$OBJCOPY",
-                "-O",
-                "binary",
-                "$SOURCES",
-                "$TARGET"]),
-            suffix=".bin"
-        )
-    )
+    CPPDEFINES=[
+        "${BOARD_OPTIONS['build']['variant'].upper()}"
+    ],
+
+    LINKFLAGS=[
+        "-nostartfiles",
+        "-nostdlib"
+    ]
 )
 
 CORELIBS = env.ProcessGeneral()
@@ -114,16 +44,16 @@ CORELIBS = env.ProcessGeneral()
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildFirmware(CORELIBS + ["c", "gcc", "m", "nosys"])
+target_elf = env.BuildFirmware(["c", "gcc", "m", "nosys"] + CORELIBS)
 
 #
 # Target: Build the .bin file
 #
 
 if "uploadlazy" in COMMAND_LINE_TARGETS:
-    target_bin = join("$BUILD_DIR", "firmware.bin")
+    target_firm = join("$BUILD_DIR", "firmware.bin")
 else:
-    target_bin = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
+    target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
 
 #
 # Target: Print binary size
@@ -136,11 +66,11 @@ AlwaysBuild(target_size)
 # Target: Upload by default .bin file
 #
 
-upload = env.Alias(["upload", "uploadlazy"], target_bin, ("$UPLOADCMD"))
+upload = env.Alias(["upload", "uploadlazy"], target_firm, ("$UPLOADCMD"))
 AlwaysBuild(upload)
 
 #
 # Target: Define targets
 #
 
-Default([target_bin, target_size])
+Default([target_firm, target_size])