Merge pull request #136 from jmichelp/master

Move to tockloader 1.5

.github/workflows/python.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          pip install 'tockloader==1.4' pylint
+          pip install 'tockloader==1.5' pylint
       - name: Register matcher
         run: echo ::add-matcher::./.github/python_matcher.json
       - name: Test code with pylint

deploy.py

@@ -454,14 +454,10 @@ class OpenSKInstaller:
           self.args.application, str(e)))
 
   def get_padding(self):
-    fake_header = tbfh.TBFHeader("")
-    fake_header.version = 2
-    fake_header.fields["header_size"] = 0x10
-    fake_header.fields["total_size"] = (
+    padding = tbfh.TBFHeaderPadding(
         SUPPORTED_BOARDS[self.args.board].app_address -
         SUPPORTED_BOARDS[self.args.board].padding_address)
-    fake_header.fields["flags"] = 0
-    return fake_header.get_binary()
+    return padding.get_binary()
 
   def install_tock_os(self):
     board_props = SUPPORTED_BOARDS[self.args.board]
@@ -543,7 +539,7 @@ class OpenSKInstaller:
     tock.open()
     app_found = False
     with tock._start_communication_with_board():
-      apps = [app.name for app in tock._extract_all_app_headers()]
+      apps = [app.get_name() for app in tock._extract_all_app_headers()]
       app_found = expected_app in apps
     return app_found
 
@@ -582,16 +578,17 @@ class OpenSKInstaller:
                "architecture {}".format(board_props.arch)))
       app_hex = intelhex.IntelHex()
       app_hex.frombytes(
-          app_tab.extract_app(board_props.arch).get_binary(),
+          app_tab.extract_app(board_props.arch).get_binary(
+              board_props.app_address),
           offset=board_props.app_address)
       final_hex.merge(app_hex)
     info("Generating all-merged HEX file: {}".format(dest_file))
     final_hex.tofile(dest_file, format="hex")
 
   def check_prerequisites(self):
-    if not tockloader.__version__.startswith("1.4."):
+    if not tockloader.__version__.startswith("1.5."):
       fatal(("Your version of tockloader seems incompatible: found {}, "
-             "expected 1.4.x.".format(tockloader.__version__)))
+             "expected 1.5.x.".format(tockloader.__version__)))
 
     if self.args.programmer == "jlink":
       assert_mandatory_binary("JLinkExe")

setup.sh

@@ -38,7 +38,7 @@ source tools/gen_key_materials.sh
 generate_crypto_materials N
 
 rustup install $(head -n 1 rust-toolchain)
-pip3 install --user --upgrade 'tockloader==1.4' six intelhex
+pip3 install --user --upgrade 'tockloader==1.5' six intelhex
 rustup target add thumbv7em-none-eabi
 
 # Install dependency to create applications.