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

Sync upstream kernel to get more reproducible builds. #80

Merged
merged 4 commits into from
Mar 13, 2020
Merged

Sync upstream kernel to get more reproducible builds. #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6e04dd
Sync upstream kernel to get reproducible builds.
gendx Mar 12, 2020
3deca37
Add SHA-256 sum computation to CI.
gendx Mar 12, 2020
6f8b8e7
Sync nrf52840_mdk_dfu with upstream and add DFU-based boards to run_d…
gendx Mar 12, 2020
4b1d5d2
Typo.
gendx Mar 12, 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
8 changes: 8 additions & 0 deletions .github/workflows/opensk_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,16 @@ jobs:
- name: Set up OpenSK
run: ./setup.sh

- name: Building sha256sum tool
uses: actions-rs/cargo@v1
with:
command: build
args: --manifest-path third_party/tock/tools/sha256sum/Cargo.toml

- name: Building OpenSK
uses: actions-rs/cargo@v1
with:
command: build
args: --release --target=thumbv7em-none-eabi --features with_ctap1
- name: Compute SHA-256 sum
run: ./third_party/tock/tools/sha256sum/target/debug/sha256sum target/thumbv7em-none-eabi/release/ctap2
12 changes: 6 additions & 6 deletions boards/nrf52840_mdk_dfu/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ const LED1_B_PIN: Pin = Pin::P0_24;
const BUTTON_PIN: Pin = Pin::P0_18;
const BUTTON_RST_PIN: Pin = Pin::P0_02;

const UART_RTS: Pin = Pin::P0_21;
const UART_RTS: Option<Pin> = Some(Pin::P0_21);
const UART_TXD: Pin = Pin::P0_20;
const UART_CTS: Pin = Pin::P0_03;
const UART_CTS: Option<Pin> = Some(Pin::P0_03);
const UART_RXD: Pin = Pin::P0_19;

const SPI_MOSI: Pin = Pin::P0_05;
Expand Down Expand Up @@ -76,23 +76,23 @@ pub unsafe fn reset_handler() {
let button = components::button::ButtonComponent::new(board_kernel).finalize(
components::button_component_helper!((
&nrf52840::gpio::PORT[BUTTON_PIN],
capsules::button::GpioMode::LowWhenPressed,
kernel::hil::gpio::ActivationMode::ActiveLow,
kernel::hil::gpio::FloatingState::PullUp
)),
);

let led = components::led::LedsComponent::new().finalize(components::led_component_helper!(
(
&nrf52840::gpio::PORT[LED1_R_PIN],
capsules::led::ActivationMode::ActiveLow
kernel::hil::gpio::ActivationMode::ActiveLow
),
(
&nrf52840::gpio::PORT[LED1_G_PIN],
capsules::led::ActivationMode::ActiveLow
kernel::hil::gpio::ActivationMode::ActiveLow
),
(
&nrf52840::gpio::PORT[LED1_B_PIN],
capsules::led::ActivationMode::ActiveLow
kernel::hil::gpio::ActivationMode::ActiveLow
)
));
let chip = static_init!(nrf52840::chip::Chip, nrf52840::chip::new());
Expand Down
8 changes: 8 additions & 0 deletions run_desktop_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ cd libraries/crypto
cargo fmt --all -- --check
cd ../..

echo "Building sha256sum tool..."
cargo build --manifest-path third_party/tock/tools/sha256sum/Cargo.toml

echo "Checking that CTAP2 builds properly..."
cargo check --release --target=thumbv7em-none-eabi
cargo check --release --target=thumbv7em-none-eabi --features with_ctap1
Expand All @@ -39,11 +42,16 @@ 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
./third_party/tock/tools/sha256sum/target/debug/sha256sum target/thumbv7em-none-eabi/release/ctap2

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

echo "Checking that other boards build properly..."
make -C boards/nrf52840_dongle_dfu
make -C boards/nrf52840_mdk_dfu

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 33 files
+3 −2 Makefile
+23 −10 boards/Makefile.common
+12 −9 boards/acd52832/src/main.rs
+5 −5 boards/arty-e21/src/main.rs
+5 −5 boards/components/src/button.rs
+5 −5 boards/components/src/led.rs
+1 −0 boards/components/src/lib.rs
+53 −0 boards/components/src/panic_button.rs
+4 −4 boards/hail/src/main.rs
+321 −0 boards/imix/src/linear_log_test.rs
+654 −0 boards/imix/src/log_test.rs
+10 −2 boards/imix/src/main.rs
+5 −5 boards/launchxl/src/main.rs
+7 −7 boards/nordic/nrf52840_dongle/src/main.rs
+10 −10 boards/nordic/nrf52840dk/src/main.rs
+10 −10 boards/nordic/nrf52dk/src/main.rs
+5 −5 boards/nordic/nrf52dk_base/src/lib.rs
+5 −5 boards/nucleo_f429zi/src/main.rs
+3 −3 boards/nucleo_f446re/src/main.rs
+8 −8 boards/opentitan/src/main.rs
+1 −0 capsules/README.md
+5 −31 capsules/src/button.rs
+19 −9 capsules/src/debug_process_restart.rs
+9 −25 capsules/src/led.rs
+2 −0 capsules/src/lib.rs
+903 −0 capsules/src/log.rs
+52 −0 capsules/src/panic_button.rs
+3 −0 chips/sam4l/src/flashcalw.rs
+45 −0 kernel/src/hil/gpio.rs
+92 −0 kernel/src/hil/log.rs
+1 −0 kernel/src/hil/mod.rs
+10 −0 tools/sha256sum/Cargo.toml
+57 −0 tools/sha256sum/src/main.rs