Archives
/
rust-raspberrypi-OS-tutorials
mirror of https://github.com/rust-embedded/rust-raspberrypi-OS-tutorials
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump to cortex-a 3.0.0

Browse Source
pull/54/head
Andre Richter 4 years ago
parent 98d5d79acf
commit 681092829c
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E
33 changed files with 81 additions and 88 deletions
Show Stats Download Patch File Download Diff File

6
04_zero_overhead_abstraction/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -29,6 +29,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
04_zero_overhead_abstraction/Cargo.toml
Unescape Escape View File

@ -13,4 +13,4 @@ bsp_rpi4 = ["cortex-a"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }

2
04_zero_overhead_abstraction/README.md
Unescape Escape View File

@ -25,7 +25,7 @@ diff -uNr 03_hacky_hello_world/Cargo.toml 04_zero_overhead_abstraction/Cargo.tom
[dependencies]
+
+# Optional dependencies
+cortex-a = { version = "2.9.x", optional = true }
+cortex-a = { version = "3.0.x", optional = true }
diff -uNr 03_hacky_hello_world/src/_arch/aarch64/cpu/smp.rs 04_zero_overhead_abstraction/src/_arch/aarch64/cpu/smp.rs
--- 03_hacky_hello_world/src/_arch/aarch64/cpu/smp.rs

6
05_safe_globals/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -29,6 +29,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
05_safe_globals/Cargo.toml
Unescape Escape View File

@ -13,4 +13,4 @@ bsp_rpi4 = ["cortex-a"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }

6
06_drivers_gpio_uart/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
06_drivers_gpio_uart/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

2
06_drivers_gpio_uart/README.md
Unescape Escape View File

@ -105,7 +105,7 @@ diff -uNr 05_safe_globals/Cargo.toml 06_drivers_gpio_uart/Cargo.toml
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
+register = { version = "0.5.x", optional = true }
diff -uNr 05_safe_globals/src/_arch/aarch64/cpu.rs 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs

6
07_uart_chainloader/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
07_uart_chainloader/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

6
08_timestamps/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
08_timestamps/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

6
09_hw_debug_JTAG/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
09_hw_debug_JTAG/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

6
10_privilege_level/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
10_privilege_level/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

6
11_virtual_memory/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
11_virtual_memory/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

31
11_virtual_memory/README.md
Unescape Escape View File

@ -168,12 +168,11 @@ fn set_up_mair() {
// Define the memory types being mapped.
MAIR_EL1.write(
// Attribute 1 - Cacheable normal DRAM.
MAIR_EL1::Attr1_HIGH::Memory_OuterWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ MAIR_EL1::Attr1_LOW_MEMORY::InnerWriteBack_NonTransient_ReadAlloc_WriteAlloc
MAIR_EL1::Attr1_Normal_Outer::WriteBack_NonTransient_ReadWriteAlloc +
MAIR_EL1::Attr1_Normal_Inner::WriteBack_NonTransient_ReadWriteAlloc +
// Attribute 0 - Device.
+ MAIR_EL1::Attr0_HIGH::Device
+ MAIR_EL1::Attr0_LOW_DEVICE::Device_nGnRE,
// Attribute 0 - Device.
MAIR_EL1::Attr0_Device::nonGathering_nonReordering_EarlyWriteAck,
);
}
```
@ -228,13 +227,12 @@ Let's take a look again at the piece of code for setting up the `MAIR_EL1` regis
fn set_up_mair() {
// Define the memory types being mapped.
MAIR_EL1.write(
// Attribute 1 - Cacheable normal DRAM
MAIR_EL1::Attr1_HIGH::Memory_OuterWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ MAIR_EL1::Attr1_LOW_MEMORY::InnerWriteBack_NonTransient_ReadAlloc_WriteAlloc
// Attribute 1 - Cacheable normal DRAM.
MAIR_EL1::Attr1_Normal_Outer::WriteBack_NonTransient_ReadWriteAlloc +
MAIR_EL1::Attr1_Normal_Inner::WriteBack_NonTransient_ReadWriteAlloc +
// Attribute 0 - Device
+ MAIR_EL1::Attr0_HIGH::Device
+ MAIR_EL1::Attr0_LOW_DEVICE::Device_nGnRE,
// Attribute 0 - Device.
MAIR_EL1::Attr0_Device::nonGathering_nonReordering_EarlyWriteAck,
);
}
```
@ -300,7 +298,7 @@ Minipush 1.0
diff -uNr 10_privilege_level/src/_arch/aarch64/memory/mmu.rs 11_virtual_memory/src/_arch/aarch64/memory/mmu.rs
--- 10_privilege_level/src/_arch/aarch64/memory/mmu.rs
+++ 11_virtual_memory/src/_arch/aarch64/memory/mmu.rs
@@ -0,0 +1,320 @@
@@ -0,0 +1,319 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+//
+// Copyright (c) 2018-2020 Andre Richter <andre.o.richter@gmail.com>
@ -530,12 +528,11 @@ diff -uNr 10_privilege_level/src/_arch/aarch64/memory/mmu.rs 11_virtual_memory/s
+ // Define the memory types being mapped.
+ MAIR_EL1.write(
+ // Attribute 1 - Cacheable normal DRAM.
+ MAIR_EL1::Attr1_HIGH::Memory_OuterWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ + MAIR_EL1::Attr1_LOW_MEMORY::InnerWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ MAIR_EL1::Attr1_Normal_Outer::WriteBack_NonTransient_ReadWriteAlloc +
+ MAIR_EL1::Attr1_Normal_Inner::WriteBack_NonTransient_ReadWriteAlloc +
+
+ // Attribute 0 - Device.
+ + MAIR_EL1::Attr0_HIGH::Device
+ + MAIR_EL1::Attr0_LOW_DEVICE::Device_nGnRE,
+ // Attribute 0 - Device.
+ MAIR_EL1::Attr0_Device::nonGathering_nonReordering_EarlyWriteAck,
+ );
+}
+

9
11_virtual_memory/src/_arch/aarch64/memory/mmu.rs
Unescape Escape View File

@ -227,12 +227,11 @@ fn set_up_mair() {
// Define the memory types being mapped.
MAIR_EL1.write(
// Attribute 1 - Cacheable normal DRAM.
MAIR_EL1::Attr1_HIGH::Memory_OuterWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ MAIR_EL1::Attr1_LOW_MEMORY::InnerWriteBack_NonTransient_ReadAlloc_WriteAlloc
MAIR_EL1::Attr1_Normal_Outer::WriteBack_NonTransient_ReadWriteAlloc +
MAIR_EL1::Attr1_Normal_Inner::WriteBack_NonTransient_ReadWriteAlloc +
// Attribute 0 - Device.
+ MAIR_EL1::Attr0_HIGH::Device
+ MAIR_EL1::Attr0_LOW_DEVICE::Device_nGnRE,
// Attribute 0 - Device.
MAIR_EL1::Attr0_Device::nonGathering_nonReordering_EarlyWriteAck,
);
}

6
12_exceptions_part1_groundwork/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
12_exceptions_part1_groundwork/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

9
12_exceptions_part1_groundwork/src/_arch/aarch64/memory/mmu.rs
Unescape Escape View File

@ -227,12 +227,11 @@ fn set_up_mair() {
// Define the memory types being mapped.
MAIR_EL1.write(
// Attribute 1 - Cacheable normal DRAM.
MAIR_EL1::Attr1_HIGH::Memory_OuterWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ MAIR_EL1::Attr1_LOW_MEMORY::InnerWriteBack_NonTransient_ReadAlloc_WriteAlloc
MAIR_EL1::Attr1_Normal_Outer::WriteBack_NonTransient_ReadWriteAlloc +
MAIR_EL1::Attr1_Normal_Inner::WriteBack_NonTransient_ReadWriteAlloc +
// Attribute 0 - Device.
+ MAIR_EL1::Attr0_HIGH::Device
+ MAIR_EL1::Attr0_LOW_DEVICE::Device_nGnRE,
// Attribute 0 - Device.
MAIR_EL1::Attr0_Device::nonGathering_nonReordering_EarlyWriteAck,
);
}

6
13_integrated_testing/Cargo.lock generated
Unescape Escape View File

@ -28,7 +28,7 @@ dependencies = [
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -38,7 +38,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"qemu-exit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"test-macros 0.1.0",
@ -159,7 +159,7 @@ dependencies = [
"checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
"checksum qemu-exit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6eef8966dfa42074458b801f4ca70c0a070a84a500022584cc11d7a3c1fdb105"

2
13_integrated_testing/Cargo.toml
Unescape Escape View File

@ -15,7 +15,7 @@ qemu-exit = "0.1.x"
test-types = { path = "test-types" }
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", features=["no_std_unit_tests"], optional = true }
##--------------------------------------------------------------------------------------------------

2
13_integrated_testing/README.md
Unescape Escape View File

@ -786,7 +786,7 @@ diff -uNr 12_exceptions_part1_groundwork/Cargo.toml 13_integrated_testing/Cargo.
+test-types = { path = "test-types" }
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
-register = { version = "0.5.x", optional = true }
+register = { version = "0.5.x", features=["no_std_unit_tests"], optional = true }
+

9
13_integrated_testing/src/_arch/aarch64/memory/mmu.rs
Unescape Escape View File

@ -227,12 +227,11 @@ fn set_up_mair() {
// Define the memory types being mapped.
MAIR_EL1.write(
// Attribute 1 - Cacheable normal DRAM.
MAIR_EL1::Attr1_HIGH::Memory_OuterWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ MAIR_EL1::Attr1_LOW_MEMORY::InnerWriteBack_NonTransient_ReadAlloc_WriteAlloc
MAIR_EL1::Attr1_Normal_Outer::WriteBack_NonTransient_ReadWriteAlloc +
MAIR_EL1::Attr1_Normal_Inner::WriteBack_NonTransient_ReadWriteAlloc +
// Attribute 0 - Device.
+ MAIR_EL1::Attr0_HIGH::Device
+ MAIR_EL1::Attr0_LOW_DEVICE::Device_nGnRE,
// Attribute 0 - Device.
MAIR_EL1::Attr0_Device::nonGathering_nonReordering_EarlyWriteAck,
);
}

6
14_exceptions_part2_peripheral_IRQs/Cargo.lock generated
Unescape Escape View File

@ -28,7 +28,7 @@ dependencies = [
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -38,7 +38,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"qemu-exit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"test-macros 0.1.0",
@ -159,7 +159,7 @@ dependencies = [
"checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
"checksum qemu-exit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6eef8966dfa42074458b801f4ca70c0a070a84a500022584cc11d7a3c1fdb105"

2
14_exceptions_part2_peripheral_IRQs/Cargo.toml
Unescape Escape View File

@ -16,7 +16,7 @@ qemu-exit = "0.1.x"
test-types = { path = "test-types" }
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", features=["no_std_unit_tests"], optional = true }
##--------------------------------------------------------------------------------------------------

9
14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/memory/mmu.rs
Unescape Escape View File

@ -227,12 +227,11 @@ fn set_up_mair() {
// Define the memory types being mapped.
MAIR_EL1.write(
// Attribute 1 - Cacheable normal DRAM.
MAIR_EL1::Attr1_HIGH::Memory_OuterWriteBack_NonTransient_ReadAlloc_WriteAlloc
+ MAIR_EL1::Attr1_LOW_MEMORY::InnerWriteBack_NonTransient_ReadAlloc_WriteAlloc
MAIR_EL1::Attr1_Normal_Outer::WriteBack_NonTransient_ReadWriteAlloc +
MAIR_EL1::Attr1_Normal_Inner::WriteBack_NonTransient_ReadWriteAlloc +
// Attribute 0 - Device.
+ MAIR_EL1::Attr0_HIGH::Device
+ MAIR_EL1::Attr0_LOW_DEVICE::Device_nGnRE,
// Attribute 0 - Device.
MAIR_EL1::Attr0_Device::nonGathering_nonReordering_EarlyWriteAck,
);
}

6
X1_JTAG_boot/Cargo.lock generated
Unescape Escape View File

@ -2,7 +2,7 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "2.9.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -12,7 +12,7 @@ dependencies = [
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -30,6 +30,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd807a12241940332c7c9f6aeaf3f7539d4213853d32445d17c97f3e7eebe118"
"checksum cortex-a 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe426c156a94855f18a660f9310c2f277b7f03d2c2ba4d4c6e0b7aa16b02cbc2"
"checksum register 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e10c2ba523bc81270ecb9b6ca6704f42cd1efec89fddbfe0e520ad0e218f401"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
X1_JTAG_boot/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "2.9.x", optional = true }
cortex-a = { version = "3.0.x", optional = true }
register = { version = "0.5.x", optional = true }

BIN
X1_JTAG_boot/jtag_boot_rpi3.img
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save