Skip to content

Commit 5e3af39

Browse files
andre-richterandre-richter
committed
Change to aarch64-cpu crate
1 parent 60ae470 commit 5e3af39

File tree

152 files changed

+231
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+231
-423
lines changed

Diff for: ‎02_runtime_init/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎02_runtime_init/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ path = "src/main.rs"
2424

2525
# Platform specific dependencies
2626
[target.'cfg(target_arch = "aarch64")'.dependencies]
27-
cortex-a = { version = "8.x.x" }
27+
aarch64-cpu = { version = "9.x.x" }

Diff for: ‎02_runtime_init/README.ES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
* Llama a `kernel_init()`, que llama a `panic!()`, que al final también pone al núcleo 0 en pausa.
3030

31-
* La librería ahora usa el crate [cortex-a](https://github.com/rust-embedded/cortex-a), que nos da abstracciones sin coste y envuelve las partes que hacen uso de un `unsafe` (partes con código que no es seguro y podría causar errores) cuando se trabaja directamente con los recursos del procesador.
31+
* La librería ahora usa el crate [aarch64-cpu](https://github.com/rust-embedded/aarch64-cpu), que nos da abstracciones sin coste y envuelve las partes que hacen uso de un `unsafe` (partes con código que no es seguro y podría causar errores) cuando se trabaja directamente con los recursos del procesador.
3232

3333
* Lo puedes ver en acción en `_arch/__arch_name__/cpu.rs`.
3434

Diff for: ‎02_runtime_init/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
1. Jumps to the `_start_rust()` function, defined in `arch/__arch_name__/cpu/boot.rs`.
2020
- `_start_rust()`:
2121
- Calls `kernel_init()`, which calls `panic!()`, which eventually halts core0 as well.
22-
- The library now uses the [cortex-a] crate, which provides zero-overhead abstractions and wraps
22+
- The library now uses the [aarch64-cpu] crate, which provides zero-overhead abstractions and wraps
2323
`unsafe` parts when dealing with the CPU's resources.
2424
- See it in action in `_arch/__arch_name__/cpu.rs`.
2525

2626
[bss]: https://en.wikipedia.org/wiki/.bss
27-
[cortex-a]: https://github.com/rust-embedded/cortex-a
27+
[aarch64-cpu]: https://github.com/rust-embedded/aarch64-cpu
2828

2929
## Diff to previous
3030
```diff
@@ -47,7 +47,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml
4747
+
4848
+# Platform specific dependencies
4949
+[target.'cfg(target_arch = "aarch64")'.dependencies]
50-
+cortex-a = { version = "8.x.x" }
50+
+aarch64-cpu = { version = "9.x.x" }
5151

5252
diff -uNr 01_wait_forever/Makefile 02_runtime_init/Makefile
5353
--- 01_wait_forever/Makefile
@@ -165,7 +165,7 @@ diff -uNr 01_wait_forever/src/_arch/aarch64/cpu.rs 02_runtime_init/src/_arch/aar
165165
+//!
166166
+//! crate::cpu::arch_cpu
167167
+
168-
+use cortex_a::asm;
168+
+use aarch64_cpu::asm;
169169
+
170170
+//--------------------------------------------------------------------------------------------------
171171
+// Public Code

Diff for: ‎02_runtime_init/src/_arch/aarch64/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! crate::cpu::arch_cpu
1313
14-
use cortex_a::asm;
14+
use aarch64_cpu::asm;
1515

1616
//--------------------------------------------------------------------------------------------------
1717
// Public Code

Diff for: ‎03_hacky_hello_world/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎03_hacky_hello_world/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ path = "src/main.rs"
2424

2525
# Platform specific dependencies
2626
[target.'cfg(target_arch = "aarch64")'.dependencies]
27-
cortex-a = { version = "8.x.x" }
27+
aarch64-cpu = { version = "9.x.x" }

Diff for: ‎03_hacky_hello_world/src/_arch/aarch64/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! crate::cpu::arch_cpu
1313
14-
use cortex_a::asm;
14+
use aarch64_cpu::asm;
1515

1616
//--------------------------------------------------------------------------------------------------
1717
// Public Code

Diff for: ‎04_safe_globals/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎04_safe_globals/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ path = "src/main.rs"
2424

2525
# Platform specific dependencies
2626
[target.'cfg(target_arch = "aarch64")'.dependencies]
27-
cortex-a = { version = "8.x.x" }
27+
aarch64-cpu = { version = "9.x.x" }

Diff for: ‎04_safe_globals/src/_arch/aarch64/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! crate::cpu::arch_cpu
1313
14-
use cortex_a::asm;
14+
use aarch64_cpu::asm;
1515

1616
//--------------------------------------------------------------------------------------------------
1717
// Public Code

Diff for: ‎05_drivers_gpio_uart/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎05_drivers_gpio_uart/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ tock-registers = { version = "0.8.x", default-features = false, features = ["reg
2727

2828
# Platform specific dependencies
2929
[target.'cfg(target_arch = "aarch64")'.dependencies]
30-
cortex-a = { version = "8.x.x" }
30+
aarch64-cpu = { version = "9.x.x" }

Diff for: ‎05_drivers_gpio_uart/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ diff -uNr 04_safe_globals/Cargo.toml 05_drivers_gpio_uart/Cargo.toml
181181
+
182182
# Platform specific dependencies
183183
[target.'cfg(target_arch = "aarch64")'.dependencies]
184-
cortex-a = { version = "8.x.x" }
184+
aarch64-cpu = { version = "9.x.x" }
185185

186186
diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile
187187
--- 04_safe_globals/Makefile

Diff for: ‎05_drivers_gpio_uart/src/_arch/aarch64/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! crate::cpu::arch_cpu
1313
14-
use cortex_a::asm;
14+
use aarch64_cpu::asm;
1515

1616
//--------------------------------------------------------------------------------------------------
1717
// Public Code

Diff for: ‎06_uart_chainloader/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎06_uart_chainloader/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ tock-registers = { version = "0.8.x", default-features = false, features = ["reg
2727

2828
# Platform specific dependencies
2929
[target.'cfg(target_arch = "aarch64")'.dependencies]
30-
cortex-a = { version = "8.x.x" }
30+
aarch64-cpu = { version = "9.x.x" }

Diff for: ‎06_uart_chainloader/demo_payload_rpi3.img

1.8 KB
Binary file not shown.

Diff for: ‎06_uart_chainloader/demo_payload_rpi4.img

1.84 KB
Binary file not shown.

Diff for: ‎06_uart_chainloader/src/_arch/aarch64/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! crate::cpu::arch_cpu
1313
14-
use cortex_a::asm;
14+
use aarch64_cpu::asm;
1515

1616
//--------------------------------------------------------------------------------------------------
1717
// Public Code

Diff for: ‎07_timestamps/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎07_timestamps/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ tock-registers = { version = "0.8.x", default-features = false, features = ["reg
2727

2828
# Platform specific dependencies
2929
[target.'cfg(target_arch = "aarch64")'.dependencies]
30-
cortex-a = { version = "8.x.x" }
30+
aarch64-cpu = { version = "9.x.x" }

Diff for: ‎07_timestamps/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,12 @@ diff -uNr 06_uart_chainloader/src/_arch/aarch64/time.rs 07_timestamps/src/_arch/
272272
+//! crate::time::arch_time
273273
+
274274
+use crate::warn;
275+
+use aarch64_cpu::{asm::barrier, registers::*};
275276
+use core::{
276277
+ num::{NonZeroU128, NonZeroU32, NonZeroU64},
277278
+ ops::{Add, Div},
278279
+ time::Duration,
279280
+};
280-
+use cortex_a::{asm::barrier, registers::*};
281281
+use tock_registers::interfaces::Readable;
282282
+
283283
+//--------------------------------------------------------------------------------------------------

Diff for: ‎07_timestamps/src/_arch/aarch64/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! crate::cpu::arch_cpu
1313
14-
use cortex_a::asm;
14+
use aarch64_cpu::asm;
1515

1616
//--------------------------------------------------------------------------------------------------
1717
// Public Code

Diff for: ‎07_timestamps/src/_arch/aarch64/time.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
//! crate::time::arch_time
1313
1414
use crate::warn;
15+
use aarch64_cpu::{asm::barrier, registers::*};
1516
use core::{
1617
num::{NonZeroU128, NonZeroU32, NonZeroU64},
1718
ops::{Add, Div},
1819
time::Duration,
1920
};
20-
use cortex_a::{asm::barrier, registers::*};
2121
use tock_registers::interfaces::Readable;
2222

2323
//--------------------------------------------------------------------------------------------------

Diff for: ‎08_hw_debug_JTAG/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎08_hw_debug_JTAG/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ tock-registers = { version = "0.8.x", default-features = false, features = ["reg
2727

2828
# Platform specific dependencies
2929
[target.'cfg(target_arch = "aarch64")'.dependencies]
30-
cortex-a = { version = "8.x.x" }
30+
aarch64-cpu = { version = "9.x.x" }

Diff for: ‎08_hw_debug_JTAG/src/_arch/aarch64/cpu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! crate::cpu::arch_cpu
1313
14-
use cortex_a::asm;
14+
use aarch64_cpu::asm;
1515

1616
//--------------------------------------------------------------------------------------------------
1717
// Public Code

Diff for: ‎08_hw_debug_JTAG/src/_arch/aarch64/time.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
//! crate::time::arch_time
1313
1414
use crate::warn;
15+
use aarch64_cpu::{asm::barrier, registers::*};
1516
use core::{
1617
num::{NonZeroU128, NonZeroU32, NonZeroU64},
1718
ops::{Add, Div},
1819
time::Duration,
1920
};
20-
use cortex_a::{asm::barrier, registers::*};
2121
use tock_registers::interfaces::Readable;
2222

2323
//--------------------------------------------------------------------------------------------------

Diff for: ‎09_privilege_level/Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎09_privilege_level/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ tock-registers = { version = "0.8.x", default-features = false, features = ["reg
2727

2828
# Platform specific dependencies
2929
[target.'cfg(target_arch = "aarch64")'.dependencies]
30-
cortex-a = { version = "8.x.x" }
30+
aarch64-cpu = { version = "9.x.x" }

0 commit comments

Comments
 (0)