Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove patch #67

Merged
merged 9 commits into from
Mar 6, 2020
Merged

Remove patch #67

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf9e362
Sync with upstream Tock to remove the latest patch.
gendx Mar 5, 2020
68ec755
Add tests that supported boards build properly.
gendx Mar 5, 2020
0fe4889
Add GitHub workflow to build the boards.
gendx Mar 5, 2020
6d323f3
Apply make suggestions.
gendx Mar 5, 2020
eac6f1d
Build boards only when relevant paths are affected.
gendx Mar 5, 2020
ed35019
Move third_party/tock to a long build directory to catch limits in th…
gendx Mar 5, 2020
0036858
Increase ROM size in layout.ld so that boards build on long build dir…
gendx Mar 5, 2020
1fca163
Remove paths rules from workflows/boards_build.
gendx Mar 5, 2020
3af13f1
Add path protection on push for workflows/boards_build.
gendx Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/boards_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Build supported boards
on:
push:
gendx marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
types: [opened, synchronize, reopened]

jobs:
build_boards:
strategy:
matrix:
os: [ubuntu-18.04, macos-10.15]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
target: thumbv7em-none-eabi
- uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install Python dependencies
run: python -m pip install --upgrade pip setuptools wheel
- name: Set up OpenSK
run: ./setup.sh
- 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/

- name: Building board nrf52840dk
gendx marked this conversation as resolved.
Show resolved Hide resolved
run: make -C this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz/third_party/tock/boards/nordic/nrf52840dk
- name: Building board nrf52840_dongle
run: make -C this-is-a-long-build-directory-0123456789abcdefghijklmnopqrstuvwxyz/third_party/tock/boards/nordic/nrf52840_dongle
2 changes: 1 addition & 1 deletion patches/tock/01-persistent-storage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ index ece4a443..9a1afc84 100644
}
+
+ pub fn in_writeable_flash_region(&self, ptr: usize, len: usize) -> bool {
+ self.kernel.process_map_or(false, self.idx, |process| {
+ self.kernel.process_map_or(false, *self, |process| {
+ let ptr = match ptr.checked_sub(process.flash_start() as usize) {
+ None => return false,
+ Some(ptr) => ptr,
Expand Down
46 changes: 0 additions & 46 deletions patches/tock/04-fix-dynamic-deferred-call.patch
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions patches/tock/04-increase-rom-nordic.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/boards/nordic/nrf52840_dongle/layout.ld b/boards/nordic/nrf52840_dongle/layout.ld
index 657b0d26..f86b2321 100644
--- a/boards/nordic/nrf52840_dongle/layout.ld
+++ b/boards/nordic/nrf52840_dongle/layout.ld
@@ -1,6 +1,6 @@
MEMORY
{
- rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K
+ rom (rx) : ORIGIN = 0x00000000, LENGTH = 192K
prog (rx) : ORIGIN = 0x00030000, LENGTH = 832K
ram (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
}
diff --git a/boards/nordic/nrf52840dk/layout.ld b/boards/nordic/nrf52840dk/layout.ld
index 657b0d26..f86b2321 100644
--- a/boards/nordic/nrf52840dk/layout.ld
+++ b/boards/nordic/nrf52840dk/layout.ld
@@ -1,6 +1,6 @@
MEMORY
{
- rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K
+ rom (rx) : ORIGIN = 0x00000000, LENGTH = 192K
prog (rx) : ORIGIN = 0x00030000, LENGTH = 832K
ram (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
}
4 changes: 4 additions & 0 deletions run_desktop_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ cargo check --release --target=thumbv7em-none-eabi --examples
echo "Checking that CTAP2 builds and links properly (1 set of features)..."
cargo build --release --target=thumbv7em-none-eabi --features with_ctap1

echo "Checking that supported boards build properly..."
make -C third_party/tock/boards/nordic/nrf52840dk
make -C third_party/tock/boards/nordic/nrf52840_dongle

if [ -z "${TRAVIS_OS_NAME}" -o "${TRAVIS_OS_NAME}" = "linux" ]
then
echo "Running unit tests on the desktop (release mode)..."
Expand Down
2 changes: 1 addition & 1 deletion third_party/tock
Open in desktop
Submodule tock updated 56 files
+1 −1 .travis.yml
+1 −1 .vscode/settings.json
+1 −1 arch/cortex-m/src/lib.rs
+2 −2 arch/cortex-m0/src/lib.rs
+2 −2 arch/cortex-m3/src/lib.rs
+2 −2 arch/cortex-m4/src/lib.rs
+18 −18 arch/rv32i/src/clic.rs
+0 −1 arch/rv32i/src/lib.rs
+2 −0 boards/components/src/crc.rs
+0 −1 boards/components/src/lib.rs
+1 −1 boards/hail/src/main.rs
+1 −1 boards/imix/src/main.rs
+125 −6 boards/nucleo_f429zi/src/main.rs
+1 −1 boards/nucleo_f446re/src/main.rs
+154 −40 capsules/src/adc.rs
+4 −4 capsules/src/ble_advertising_driver.rs
+2 −2 capsules/src/low_level_debug/mod.rs
+1 −1 capsules/src/net/ipv6/ip_utils.rs
+34 −11 capsules/src/process_console.rs
+3 −3 capsules/src/rf233_const.rs
+1 −2 chips/arty_e21/src/lib.rs
+1 −2 chips/cc26x2/src/lib.rs
+1 −1 chips/e310x/src/chip.rs
+1 −2 chips/e310x/src/lib.rs
+1 −1 chips/e310x/src/plic.rs
+1 −2 chips/ibex/src/lib.rs
+1 −3 chips/lowrisc/src/lib.rs
+3 −3 chips/nrf52/src/acomp.rs
+1 −1 chips/nrf52/src/lib.rs
+182 −182 chips/sam4l/src/acifc.rs
+10 −14 chips/sam4l/src/crccu.rs
+1 −1 chips/sam4l/src/eic.rs
+1 −2 chips/sam4l/src/lib.rs
+38 −38 chips/sam4l/src/pm.rs
+1 −3 chips/sifive/src/lib.rs
+14 −14 chips/sifive/src/rtc.rs
+14 −14 chips/sifive/src/watchdog.rs
+2 −2 doc/Getting_Started.md
+ − doc/architecture.png
+72 −0 doc/wg/opentitan-notes/2020-02-21.md
+9 −5 doc/wg/opentitan.md
+87 −9 kernel/src/callback.rs
+18 −16 kernel/src/common/dynamic_deferred_call.rs
+95 −63 kernel/src/grant.rs
+3 −0 kernel/src/hil/crc.rs
+0 −1 kernel/src/hil/flash.rs
+36 −9 kernel/src/introspection.rs
+109 −56 kernel/src/ipc.rs
+9 −4 kernel/src/lib.rs
+3 −3 kernel/src/mem.rs
+157 −35 kernel/src/process.rs
+102 −21 kernel/src/sched.rs
+1 −1 libraries/tock-cells/src/lib.rs
+1 −1 rust-toolchain
+1 −1 shell.nix
+1 −1 tools/netlify-build.sh