Skip to content

Tie to release-1.3 kernel + small nits #15

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

Merged
merged 1 commit into from
Jun 12, 2019
Merged

Tie to release-1.3 kernel + small nits #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 30 additions & 30 deletions boards/hail-bootloader/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions boards/hail-bootloader/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ panic = "abort"
lto = true

[dependencies]
cortexm4 = { git = "https://github.com/tock/tock" }
capsules = { git = "https://github.com/tock/tock" }
kernel = { git = "https://github.com/tock/tock" }
sam4l = { git = "https://github.com/tock/tock" }
cortexm4 = { git = "https://github.com/tock/tock", tag = "release-1.3" }
capsules = { git = "https://github.com/tock/tock", tag = "release-1.3" }
kernel = { git = "https://github.com/tock/tock", tag = "release-1.3" }
sam4l = { git = "https://github.com/tock/tock", tag = "release-1.3" }
bootloader = { path = "../../bootloader" }

[build-dependencies]
Expand Down
6 changes: 2 additions & 4 deletions boards/hail-bootloader/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,12 @@ struct HailBootloader {
}

impl Platform for HailBootloader {
fn with_driver<F, R>(&self, driver_num: usize, f: F) -> R
fn with_driver<F, R>(&self, _driver_num: usize, f: F) -> R
where
F: FnOnce(Option<&kernel::Driver>) -> R,
{
// Bootloader does not support apps.
match driver_num {
_ => f(None),
}
f(None)
}
}

Expand Down
60 changes: 30 additions & 30 deletions boards/imix-bootloader/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions boards/imix-bootloader/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ panic = "abort"
lto = true

[dependencies]
cortexm4 = { git = "https://github.com/tock/tock" }
capsules = { git = "https://github.com/tock/tock" }
kernel = { git = "https://github.com/tock/tock" }
sam4l = { git = "https://github.com/tock/tock" }
cortexm4 = { git = "https://github.com/tock/tock", tag = "release-1.3" }
capsules = { git = "https://github.com/tock/tock", tag = "release-1.3" }
kernel = { git = "https://github.com/tock/tock", tag = "release-1.3" }
sam4l = { git = "https://github.com/tock/tock", tag = "release-1.3" }
bootloader = { path = "../../bootloader" }

[build-dependencies]
Expand Down
6 changes: 2 additions & 4 deletions boards/imix-bootloader/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,12 @@ struct ImixBootloader {
}

impl Platform for ImixBootloader {
fn with_driver<F, R>(&self, driver_num: usize, f: F) -> R
fn with_driver<F, R>(&self, _driver_num: usize, f: F) -> R
where
F: FnOnce(Option<&kernel::Driver>) -> R,
{
// Bootloader does not support apps.
match driver_num {
_ => f(None),
}
f(None)
}
}

Expand Down
Loading