kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #136 from jmichelp/master

Browse Source 
Move to tockloader 1.5
This commit is contained in:
Jean-Michel Picod
2020-08-11 18:09:10 +02:00
committed by GitHub
parent dcc5d58da9 f68ab0be9d
commit 5495bbd2a4
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/python.yml vendored
View File

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

17
deploy.py
View File

@@ -454,14 +454,10 @@ class OpenSKInstaller:
self.args.application, str(e))) self.args.application, str(e)))
def get_padding(self): def get_padding(self):
fake_header = tbfh.TBFHeader("") padding = tbfh.TBFHeaderPadding(
fake_header.version = 2
fake_header.fields["header_size"] = 0x10
fake_header.fields["total_size"] = (
SUPPORTED_BOARDS[self.args.board].app_address - SUPPORTED_BOARDS[self.args.board].app_address -
SUPPORTED_BOARDS[self.args.board].padding_address) SUPPORTED_BOARDS[self.args.board].padding_address)
fake_header.fields["flags"] = 0 return padding.get_binary()
return fake_header.get_binary()
def install_tock_os(self): def install_tock_os(self):
board_props = SUPPORTED_BOARDS[self.args.board] board_props = SUPPORTED_BOARDS[self.args.board]
@@ -543,7 +539,7 @@ class OpenSKInstaller:
tock.open() tock.open()
app_found = False app_found = False
with tock._start_communication_with_board(): 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 app_found = expected_app in apps
return app_found return app_found
@@ -582,16 +578,17 @@ class OpenSKInstaller:
"architecture {}".format(board_props.arch))) "architecture {}".format(board_props.arch)))
app_hex = intelhex.IntelHex() app_hex = intelhex.IntelHex()
app_hex.frombytes( 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) offset=board_props.app_address)
final_hex.merge(app_hex) final_hex.merge(app_hex)
info("Generating all-merged HEX file: {}".format(dest_file)) info("Generating all-merged HEX file: {}".format(dest_file))
final_hex.tofile(dest_file, format="hex") final_hex.tofile(dest_file, format="hex")
def check_prerequisites(self): 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 {}, " 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": if self.args.programmer == "jlink":
assert_mandatory_binary("JLinkExe") assert_mandatory_binary("JLinkExe")

2
setup.sh
View File

@@ -38,7 +38,7 @@ source tools/gen_key_materials.sh
generate_crypto_materials N generate_crypto_materials N
rustup install $(head -n 1 rust-toolchain) 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 rustup target add thumbv7em-none-eabi
# Install dependency to create applications. # Install dependency to create applications.