Allow to configure upload offset address using board_upload.offset_address option

Author: ivankravets

builder/main.py

@@ -120,7 +120,13 @@ def _jlink_cmd_script(env, source):
         if not isdir(build_dir):
             makedirs(build_dir)
         script_path = join(build_dir, "upload.jlink")
-        commands = ["h", "loadbin %s,0x0" % source, "r", "q"]
+        commands = [
+            "h",
+            "loadbin %s, %s" % (source, env.BoardConfig().get(
+                "upload.offset_address", "0x0")),
+            "r",
+            "q"
+        ]
         with open(script_path, "w") as fp:
             fp.write("\n".join(commands))
         return script_path
@@ -175,8 +181,11 @@ def _jlink_cmd_script(env, source):
         env.Replace(
             UPLOADER="openocd",
             UPLOADERFLAGS=["-s", platform.get_package_dir("tool-openocd") or ""] +
-            debug_server.get("arguments", []) +
-            ["-c", "program {{$SOURCE}} verify reset; shutdown;"],
+            debug_tools.get(upload_protocol).get("server").get("arguments", []) + [
+                "-c",
+                "program {{$SOURCE}} verify reset %s; shutdown;" %
+                env.BoardConfig().get("upload.offset_address", "")
+            ],
             UPLOADCMD="$UPLOADER $UPLOADERFLAGS"
         )
     upload_actions = [