From 0e1c76455d25bf22008b150a2d1b2dac22145e5d Mon Sep 17 00:00:00 2001
From: Jean-Michel Picod <jmichel@google.com>
Date: Thu, 12 Mar 2020 12:12:45 +0100
Subject: [PATCH] Address review round #2
---
.github/workflows/boards_build.yml | 6 ++++++
.vscode/settings.json | 1 +
deploy.py | 17 ++++++++++-------
...otloader.patch => 04-nrf52-bootloader.patch} | 0
4 files changed, 17 insertions(+), 7 deletions(-)
rename patches/tock/{07-nrf52-bootloader.patch => 04-nrf52-bootloader.patch} (100%)
diff --git a/.github/workflows/boards_build.yml b/.github/workflows/boards_build.yml
index ef71f42..0a8fbeb 100644
--- a/.github/workflows/boards_build.yml
+++ b/.github/workflows/boards_build.yml
@@ -26,6 +26,12 @@ jobs:
run: python -m pip install --upgrade pip setuptools wheel
- name: Set up OpenSK
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
run: mkdir this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz && mv third_party this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz/
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ff197f1..1666683 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -20,6 +20,7 @@
"python.linting.enabled": true,
"python.linting.lintOnSave": true,
"python.linting.pylintEnabled": true,
+ "python.linting.pylintPath": "pylint",
"[python]": {
"editor.tabSize": 2
},
diff --git a/deploy.py b/deploy.py
index fbf1b63..27e7509 100755
--- a/deploy.py
+++ b/deploy.py
@@ -41,15 +41,19 @@ PROGRAMMERS = frozenset(("jlink", "openocd", "pyocd", "nordicdfu", "none"))
OpenSKBoard = collections.namedtuple(
"OpenSKBoard",
[
- # Location of the Tock board (where the Makefile file is
+ # Location of the Tock board (where the Makefile file is)
"path",
- # Targeted architecture (e.g. thumbv7em-none-eabi)
+ # Target architecture (e.g. thumbv7em-none-eabi)
"arch",
# Size of 1 page of flash memory
"page_size",
# Flash address at which the kernel will be written
"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",
# Linker script to produce a working app for this board
"app_ldscript",
@@ -293,9 +297,8 @@ class OpenSKInstaller:
# Need to update
self.checked_command_output(
["rustup", "install", target_toolchain_fullstring])
- targets = {x.arch for x in SUPPORTED_BOARDS.values()}
- for arch in targets:
- self.checked_command_output(["rustup", "target", "add", arch])
+ self.checked_command_output(
+ ["rustup", "target", "add", SUPPORTED_BOARDS[self.args.board].arch])
info("Rust toolchain up-to-date")
def build_tockos(self):
@@ -427,7 +430,7 @@ class OpenSKInstaller:
try:
tock.flash_binary(kernel, board_props.kernel_address)
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):
padding = self.get_padding()
diff --git a/patches/tock/07-nrf52-bootloader.patch b/patches/tock/04-nrf52-bootloader.patch
similarity index 100%
rename from patches/tock/07-nrf52-bootloader.patch
rename to patches/tock/04-nrf52-bootloader.patch
--
GitLab