Skip to content

Commit 5609a9d

Browse files
authored
Merge pull request #9 from matoushybl/fix/udf
Remove cortex-m-udf as udf instruction is now part of cortex-m.
2 parents 9d816c9 + c7c06d1 commit 5609a9d

15 files changed

+5
-78
lines changed

Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[workspace]
22
members = [
33
"async-embedded",
4-
"cortex-m-udf",
54
"nrf52",
65
"panic-udf",
76
]

async-embedded/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ pin-utils = "0.1.0"
1313
typenum = "1.12.0"
1414

1515
[target.'cfg(target_arch = "arm")'.dependencies]
16-
cortex-m = "0.6.2"
17-
cortex-m-udf = { path = "../cortex-m-udf" }
16+
cortex-m = "0.6.3"
1817

1918
[target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
2019
riscv = "0.5.6"

async-embedded/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use cortex_m::asm;
1515

1616

1717
#[cfg(target_arch = "arm")]
18-
pub use cortex_m_udf::udf as abort;
18+
pub use cortex_m::asm::udf as abort;
1919

2020
#[cfg(target_arch = "arm")]
2121
#[inline]

cortex-m-udf/Cargo.toml

-8
This file was deleted.

cortex-m-udf/asm.s

-5
This file was deleted.

cortex-m-udf/assemble.sh

-23
This file was deleted.

cortex-m-udf/bin/thumbv6m-none-eabi.a

-798 Bytes
Binary file not shown.
-798 Bytes
Binary file not shown.
-798 Bytes
Binary file not shown.

cortex-m-udf/bin/thumbv7m-none-eabi.a

-798 Bytes
Binary file not shown.

cortex-m-udf/build.rs

-18
This file was deleted.

cortex-m-udf/src/lib.rs

-16
This file was deleted.

nrf52/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ publish = false
77
version = "0.0.0-alpha.0"
88

99
[dev-dependencies]
10-
cortex-m = "0.6.2"
10+
cortex-m = "0.6"
1111
cortex-m-semihosting = "0.3.5"
12-
cortex-m-udf = { path = "../cortex-m-udf" }
1312
heapless = "0.5.3"
1413
panic-semihosting = "0.5.3"
1514
panic-udf = { path = "../panic-udf" }

panic-udf/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ publish = false
77
version = "0.0.0-alpha.0"
88

99
[dependencies]
10-
cortex-m-udf = { path = "../cortex-m-udf" }
10+
cortex-m = "0.6.3"

panic-udf/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ use core::panic::PanicInfo;
99

1010
#[panic_handler]
1111
fn panic(_: &PanicInfo<'_>) -> ! {
12-
cortex_m_udf::udf()
12+
cortex_m::asm::udf()
1313
}

0 commit comments

Comments
 (0)