Address review round #2
This commit is contained in:
6
.github/workflows/boards_build.yml
vendored
6
.github/workflows/boards_build.yml
vendored
@@ -26,6 +26,12 @@ jobs:
|
|||||||
run: python -m pip install --upgrade pip setuptools wheel
|
run: python -m pip install --upgrade pip setuptools wheel
|
||||||
- name: Set up OpenSK
|
- name: Set up OpenSK
|
||||||
run: ./setup.sh
|
run: ./setup.sh
|
||||||
|
|
||||||
|
- name: Building board nrf52840_dongle_dfu
|
||||||
|
run: ./deploy.py --board=nrf52840_dongle_dfu --no-app --programmer=none
|
||||||
|
- name: Building board nrf52840_mdk_dfu
|
||||||
|
run: ./deploy.py --board=nrf52840_mdk_dfu --no-app --programmer=none
|
||||||
|
|
||||||
- name: Create a long build directory
|
- name: Create a long build directory
|
||||||
run: mkdir this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz && mv third_party this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz/
|
run: mkdir this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz && mv third_party this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz/
|
||||||
|
|
||||||
|
|||||||
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
@@ -20,6 +20,7 @@
|
|||||||
"python.linting.enabled": true,
|
"python.linting.enabled": true,
|
||||||
"python.linting.lintOnSave": true,
|
"python.linting.lintOnSave": true,
|
||||||
"python.linting.pylintEnabled": true,
|
"python.linting.pylintEnabled": true,
|
||||||
|
"python.linting.pylintPath": "pylint",
|
||||||
"[python]": {
|
"[python]": {
|
||||||
"editor.tabSize": 2
|
"editor.tabSize": 2
|
||||||
},
|
},
|
||||||
|
|||||||
17
deploy.py
17
deploy.py
@@ -41,15 +41,19 @@ PROGRAMMERS = frozenset(("jlink", "openocd", "pyocd", "nordicdfu", "none"))
|
|||||||
OpenSKBoard = collections.namedtuple(
|
OpenSKBoard = collections.namedtuple(
|
||||||
"OpenSKBoard",
|
"OpenSKBoard",
|
||||||
[
|
[
|
||||||
# Location of the Tock board (where the Makefile file is
|
# Location of the Tock board (where the Makefile file is)
|
||||||
"path",
|
"path",
|
||||||
# Targeted architecture (e.g. thumbv7em-none-eabi)
|
# Target architecture (e.g. thumbv7em-none-eabi)
|
||||||
"arch",
|
"arch",
|
||||||
# Size of 1 page of flash memory
|
# Size of 1 page of flash memory
|
||||||
"page_size",
|
"page_size",
|
||||||
# Flash address at which the kernel will be written
|
# Flash address at which the kernel will be written
|
||||||
"kernel_address",
|
"kernel_address",
|
||||||
# Set to None is padding is not required for the board
|
# Set to None is padding is not required for the board.
|
||||||
|
# This creates a fake Tock OS application that starts at the
|
||||||
|
# address specified by this parameter (must match the `prog` value
|
||||||
|
# specified on the board's `layout.ld` file) and will end at
|
||||||
|
# `app_address`.
|
||||||
"padding_address",
|
"padding_address",
|
||||||
# Linker script to produce a working app for this board
|
# Linker script to produce a working app for this board
|
||||||
"app_ldscript",
|
"app_ldscript",
|
||||||
@@ -293,9 +297,8 @@ class OpenSKInstaller:
|
|||||||
# Need to update
|
# Need to update
|
||||||
self.checked_command_output(
|
self.checked_command_output(
|
||||||
["rustup", "install", target_toolchain_fullstring])
|
["rustup", "install", target_toolchain_fullstring])
|
||||||
targets = {x.arch for x in SUPPORTED_BOARDS.values()}
|
self.checked_command_output(
|
||||||
for arch in targets:
|
["rustup", "target", "add", SUPPORTED_BOARDS[self.args.board].arch])
|
||||||
self.checked_command_output(["rustup", "target", "add", arch])
|
|
||||||
info("Rust toolchain up-to-date")
|
info("Rust toolchain up-to-date")
|
||||||
|
|
||||||
def build_tockos(self):
|
def build_tockos(self):
|
||||||
@@ -427,7 +430,7 @@ class OpenSKInstaller:
|
|||||||
try:
|
try:
|
||||||
tock.flash_binary(kernel, board_props.kernel_address)
|
tock.flash_binary(kernel, board_props.kernel_address)
|
||||||
except TockLoaderException as e:
|
except TockLoaderException as e:
|
||||||
fatal("Couldn't install padding: {}".format(str(e)))
|
fatal("Couldn't install Tock OS: {}".format(str(e)))
|
||||||
|
|
||||||
def install_padding(self):
|
def install_padding(self):
|
||||||
padding = self.get_padding()
|
padding = self.get_padding()
|
||||||
|
|||||||
Reference in New Issue
Block a user