From c94bd2d98d29cbf6d92f2f915e72d1555e282248 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 23 Dec 2017 21:34:24 +0100 Subject: add a Cargo feature, cm7-r0p1, to fix a Cortex-M7 BASEPRI erratum --- Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 05f90ab..e506be0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/japaric/cortex-m-rtfm" version = "0.3.0" [dependencies] -cortex-m = { git = "https://github.com/japaric/cortex-m" } +cortex-m = { git = "https://github.com/japaric/cortex-m", branch = "cm7-r0p1" } untagged-option = "0.1.1" # rtfm-core = "0.2.0" rtfm-core = { git = "https://github.com/japaric/rtfm-core" } @@ -32,5 +32,8 @@ features = ["rt"] git = "https://github.com/japaric/stm32f103xx" # version = "0.8.0" +[features] +cm7-r0p1 = ["cortex-m/cm7-r0p1"] + [profile.release] lto = true -- cgit v1.2.3 From 2249985e8179b50e98254459663a49a3b63e6a36 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 11 Jan 2018 15:46:27 +0100 Subject: use master branch of cortex-m --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index e506be0..641c3aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/japaric/cortex-m-rtfm" version = "0.3.0" [dependencies] -cortex-m = { git = "https://github.com/japaric/cortex-m", branch = "cm7-r0p1" } +cortex-m = { git = "https://github.com/japaric/cortex-m" } untagged-option = "0.1.1" # rtfm-core = "0.2.0" rtfm-core = { git = "https://github.com/japaric/rtfm-core" } -- cgit v1.2.3 From 6e3b9a30fd9816963813d505265b6b0fcc8951c7 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 11 Jan 2018 15:46:38 +0100 Subject: switch to a stable release of compiletest_rs --- Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 641c3aa..5af5067 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,7 @@ rtfm-core = { git = "https://github.com/japaric/rtfm-core" } cortex-m-rtfm-macros = { path = "macros" } [target.'cfg(target_arch = "x86_64")'.dev-dependencies] -# compiletest_rs = "0.3.4" -compiletest_rs = { git = "https://github.com/dwrensha/compiletest-rs", branch = "rustup" } +compiletest_rs = "0.3.8" [dev-dependencies.cortex-m-rt] features = ["abort-on-panic"] -- cgit v1.2.3 From f695bdb7e9dab1af3964ddabccf9c738dd46d774 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 11 Jan 2018 16:03:41 +0100 Subject: fix the compiletest_rs version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 5af5067..bf123dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ rtfm-core = { git = "https://github.com/japaric/rtfm-core" } cortex-m-rtfm-macros = { path = "macros" } [target.'cfg(target_arch = "x86_64")'.dev-dependencies] -compiletest_rs = "0.3.8" +compiletest_rs = "0.3.5" [dev-dependencies.cortex-m-rt] features = ["abort-on-panic"] -- cgit v1.2.3