Allow overriding offsets with "app_offset" and "header_offset"

Author: theotherjimmy

tools/build_api.py

@@ -36,7 +36,7 @@
 from .arm_pack_manager import Cache
 from .utils import (mkdir, run_cmd, run_cmd_ext, NotSupportedException,
                     ToolException, InvalidReleaseTargetException,
-                    intelhex_offset)
+                    intelhex_offset, integer)
 from .paths import (MBED_CMSIS_PATH, MBED_TARGETS_PATH, MBED_LIBRARIES,
                     MBED_HEADER, MBED_DRIVERS, MBED_PLATFORM, MBED_HAL,
                     MBED_CONFIG_FILE, MBED_LIBRARIES_DRIVERS,
@@ -353,6 +353,7 @@ def _real_region_size(region):
     except AttributeError:
         return region.size
 
+
 def _fill_header(region_list, current_region):
     """Fill an application header region
 
@@ -373,7 +374,7 @@ def _fill_header(region_list, current_region):
                 "8le": ">B", "16le": "<H", "32le": "<L", "64le": "<Q",
                 "8be": "<B", "16be": ">H", "32be": ">L", "64be": ">Q"
             }[subtype]
-            header.puts(start, struct.pack(fmt, int(data, 0)))
+            header.puts(start, struct.pack(fmt, integer(data, 0)))
         elif type == "timestamp":
             fmt = {"32le": "<L", "64le": "<Q",
                    "32be": ">L", "64be": ">Q"}[subtype]

tools/config/__init__.py

@@ -30,7 +30,7 @@
 from jinja2.environment import Environment
 from jsonschema import Draft4Validator, RefResolver
 
-from ..utils import json_file_to_dict, intelhex_offset
+from ..utils import json_file_to_dict, intelhex_offset, integer
 from ..arm_pack_manager import Cache
 from ..targets import (CUMULATIVE_ATTRIBUTES, TARGET_MAP, generate_py_target,
                        get_resolution_order, Target)
@@ -41,9 +41,11 @@
     unicode = str
 PATH_OVERRIDES = set(["target.bootloader_img"])
 BOOTLOADER_OVERRIDES = set(["target.bootloader_img", "target.restrict_size",
-                            "target.header_format",
+                            "target.header_format", "target.header_offset",
+                            "target.app_offset",
                             "target.mbed_app_start", "target.mbed_app_size"])
 
+
 # Base class for all configuration exceptions
 class ConfigException(Exception):
     """Config system only exception. Makes it easier to distinguish config
@@ -589,13 +591,21 @@ def header_member_size(member):
     def _header_size(format):
         return sum(Config.header_member_size(m) for m in format)
 
-    def _make_header_region(self, start, header_format):
+    def _make_header_region(self, start, header_format, offset=None):
         size = self._header_size(header_format)
         region = Region("header", start, size, False, None)
         start += size
         start = ((start + 7) // 8) * 8
         return (start, region)
 
+    @staticmethod
+    def _assign_new_offset(rom_start, start, new_offset, region_name):
+        newstart = rom_start + integer(new_offset, 0)
+        if newstart < start:
+            raise ConfigException(
+                "Can not place % region inside previous region" % region_name)
+        return newstart
+
     def _generate_bootloader_build(self, rom_start, rom_size):
         start = rom_start
         rom_end = rom_start + rom_size
@@ -617,6 +627,9 @@ def _generate_bootloader_build(self, rom_start, rom_size):
                          filename)
             start = rom_start + part_size
             if self.target.header_format:
+                if self.target.header_offset:
+                    start = self._assign_new_offset(
+                        rom_start, start, self.target.header_offset, "header")
                 start, region = self._make_header_region(
                     start, self.target.header_format)
                 yield region._replace(filename=self.target.header_format)
@@ -626,12 +639,21 @@ def _generate_bootloader_build(self, rom_start, rom_size):
             yield Region("application", start, new_size, True, None)
             start += new_size
             if self.target.header_format:
+                if self.target.header_offset:
+                    start = self._assign_new_offset(
+                        rom_start, start, self.target.header_offset, "header")
                 start, region = self._make_header_region(
                     start, self.target.header_format)
                 yield region
+            if self.target.app_offset:
+                start = self._assign_new_offset(
+                    rom_start, start, self.target.app_offset, "application")
             yield Region("post_application", start, rom_end - start,
                          False, None)
         else:
+            if self.target.app_offset:
+                start = self._assign_new_offset(
+                    rom_start, start, self.target.app_offset, "application")
             yield Region("application", start, rom_end - start,
                          True, None)
         if start > rom_start + rom_size:

tools/utils.py

@@ -539,3 +539,11 @@ def intelhex_offset(filename, offset):
         raise ToolException("File %s does not have a known binary file type"
                             % filename)
     return ih
+
+
+def integer(maybe_string, base):
+    """Make an integer of a number or a string"""
+    if isinstance(maybe_string, int):
+        return maybe_string
+    else:
+        return int(maybe_string, base)