forked from google/OpenSK
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into algorithm-identifier-openssh
- Loading branch information
Showing
22 changed files
with
93 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
[package] | ||
name = "nrf52840_dongle_dfu" | ||
version = "0.1.0" | ||
authors = ["Tock Project Developers <[email protected]>"] | ||
build = "build.rs" | ||
edition = "2018" | ||
|
||
[[bin]] | ||
path = "../nrf52840_dongle/src/main.rs" | ||
name = "nrf52840_dongle_dfu" | ||
|
||
[dependencies] | ||
components = { path = "../../components" } | ||
cortexm4 = { path = "../../../arch/cortex-m4" } | ||
capsules = { path = "../../../capsules" } | ||
kernel = { path = "../../../kernel" } | ||
nrf52840 = { path = "../../../chips/nrf52840" } | ||
nrf52dk_base = { path = "../nrf52dk_base" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
fn main() { | ||
println!("cargo:rerun-if-changed=layout.ld"); | ||
println!("cargo:rerun-if-changed=../../kernel_layout.ld"); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,4 +7,4 @@ MEMORY | |
|
||
MPU_MIN_ALIGN = 8K; | ||
|
||
INCLUDE ../../third_party/tock/boards/kernel_layout.ld | ||
INCLUDE ../../kernel_layout.ld |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
[package] | ||
name = "nrf52840_mdk_dfu" | ||
version = "0.1.0" | ||
authors = ["Yihui Xiong <[email protected]>"] | ||
build = "build.rs" | ||
edition = "2018" | ||
|
||
[dependencies] | ||
components = { path = "../../components" } | ||
cortexm4 = { path = "../../../arch/cortex-m4" } | ||
capsules = { path = "../../../capsules" } | ||
kernel = { path = "../../../kernel" } | ||
nrf52840 = { path = "../../../chips/nrf52840" } | ||
nrf52dk_base = { path = "../nrf52dk_base" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
fn main() { | ||
println!("cargo:rerun-if-changed=layout.ld"); | ||
println!("cargo:rerun-if-changed=../../kernel_layout.ld"); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,4 +7,4 @@ MEMORY | |
|
||
MPU_MIN_ALIGN = 8K; | ||
|
||
INCLUDE ../../third_party/tock/boards/kernel_layout.ld | ||
INCLUDE ../../kernel_layout.ld |
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/Cargo.toml b/Cargo.toml | ||
index 18f4a10d..db88dc1d 100644 | ||
--- a/Cargo.toml | ||
+++ b/Cargo.toml | ||
@@ -13,6 +13,8 @@ members = [ | ||
"boards/launchxl", | ||
"boards/nordic/nrf52840dk", | ||
"boards/nordic/nrf52840_dongle", | ||
+ "boards/nordic/nrf52840_dongle_dfu", | ||
+ "boards/nordic/nrf52840_mdk_dfu", | ||
"boards/nordic/nrf52dk", | ||
"boards/nucleo_f429zi", | ||
"boards/nucleo_f446re", |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters