Make cortex-a platform specific dep

01_wait_forever/Cargo.toml

@@ -10,4 +10,8 @@ default = []
 bsp_rpi3 = []
 bsp_rpi4 = []
 
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
+
 [dependencies]

02_runtime_init/Cargo.toml

@@ -10,4 +10,8 @@ default = []
 bsp_rpi3 = []
 bsp_rpi4 = []
 
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
+
 [dependencies]

03_hacky_hello_world/Cargo.toml

@@ -10,4 +10,8 @@ default = []
 bsp_rpi3 = []
 bsp_rpi4 = []
 
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
+
 [dependencies]

04_zero_overhead_abstraction/Cargo.toml

@@ -7,10 +7,16 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a"]
+bsp_rpi3 = []
-bsp_rpi4 = ["cortex-a"]
+bsp_rpi4 = []
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
-# Optional dependencies
+# Platform specific dependencies
-cortex-a = { version = "4.x.x", optional = true }
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

04_zero_overhead_abstraction/README.md

@@ -13,19 +13,15 @@
 diff -uNr 03_hacky_hello_world/Cargo.toml 04_zero_overhead_abstraction/Cargo.toml
 --- 03_hacky_hello_world/Cargo.toml
 +++ 04_zero_overhead_abstraction/Cargo.toml
-@@ -7,7 +7,10 @@
+@@ -15,3 +15,8 @@
- # The features section is used to select the target board.
+ ##--------------------------------------------------------------------------------------------------
- [features]
- default = []
--bsp_rpi3 = []
--bsp_rpi4 = []
-+bsp_rpi3 = ["cortex-a"]
-+bsp_rpi4 = ["cortex-a"]
 
  [dependencies]
 +
-+# Optional dependencies
++# Platform specific dependencies
-+cortex-a = { version = "4.x.x", optional = true }
++[target.'cfg(target_arch = "aarch64")'.dependencies]
++cortex-a = { version = "4.x.x" }
++
 
 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

05_safe_globals/Cargo.toml

@@ -7,10 +7,16 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a"]
+bsp_rpi3 = []
-bsp_rpi4 = ["cortex-a"]
+bsp_rpi4 = []
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
-# Optional dependencies
+# Platform specific dependencies
-cortex-a = { version = "4.x.x", optional = true }
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

06_drivers_gpio_uart/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

06_drivers_gpio_uart/README.md

@@ -94,20 +94,27 @@ $ sudo screen /dev/ttyUSB0 230400
 diff -uNr 05_safe_globals/Cargo.toml 06_drivers_gpio_uart/Cargo.toml
 --- 05_safe_globals/Cargo.toml
 +++ 06_drivers_gpio_uart/Cargo.toml
-@@ -7,10 +7,11 @@
+@@ -7,8 +7,8 @@
  # The features section is used to select the target board.
  [features]
  default = []
--bsp_rpi3 = ["cortex-a"]
+-bsp_rpi3 = []
--bsp_rpi4 = ["cortex-a"]
+-bsp_rpi4 = []
-+bsp_rpi3 = ["cortex-a", "register"]
++bsp_rpi3 = ["register"]
-+bsp_rpi4 = ["cortex-a", "register"]
++bsp_rpi4 = ["register"]
+
+ ##--------------------------------------------------------------------------------------------------
+ ## Dependencies
+@@ -16,6 +16,9 @@
 
  [dependencies]
 
- # Optional dependencies
++# Optional dependencies
- cortex-a = { version = "4.x.x", optional = true }
 +register = { version = "0.5.x", optional = true }
++
+ # Platform specific dependencies
+ [target.'cfg(target_arch = "aarch64")'.dependencies]
+ cortex-a = { version = "4.x.x" }
 
 diff -uNr 05_safe_globals/src/_arch/aarch64/cpu.rs 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs
 --- 05_safe_globals/src/_arch/aarch64/cpu.rs

07_uart_chainloader/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

08_timestamps/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

09_hw_debug_JTAG/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

10_privilege_level/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

11_virtual_mem_part1_identity_mapping/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

12_exceptions_part1_groundwork/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+

13_integrated_testing/Cargo.toml

@@ -7,17 +7,24 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 qemu-exit = "1.0.x"
 test-types = { path = "test-types" }
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
 
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+
 ##--------------------------------------------------------------------------------------------------
 ## Testing
 ##--------------------------------------------------------------------------------------------------

13_integrated_testing/README.md

@@ -797,18 +797,21 @@ diff -uNr 12_exceptions_part1_groundwork/.cargo/config.toml 13_integrated_testin
 diff -uNr 12_exceptions_part1_groundwork/Cargo.toml 13_integrated_testing/Cargo.toml
 --- 12_exceptions_part1_groundwork/Cargo.toml
 +++ 13_integrated_testing/Cargo.toml
-@@ -11,7 +11,35 @@
+@@ -15,11 +15,38 @@
- bsp_rpi4 = ["cortex-a", "register"]
+ ##--------------------------------------------------------------------------------------------------
 
  [dependencies]
 +qemu-exit = "1.0.x"
 +test-types = { path = "test-types" }
 
  # Optional dependencies
- cortex-a = { version = "4.x.x", optional = true }
 -register = { version = "0.5.x", optional = true }
 +register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
-+
+
+ # Platform specific dependencies
+ [target.'cfg(target_arch = "aarch64")'.dependencies]
+ cortex-a = { version = "4.x.x" }
+
 +##--------------------------------------------------------------------------------------------------
 +## Testing
 +##--------------------------------------------------------------------------------------------------

14_exceptions_part2_peripheral_IRQs/Cargo.toml

@@ -7,17 +7,24 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 qemu-exit = "1.0.x"
 test-types = { path = "test-types" }
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
 
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+
 ##--------------------------------------------------------------------------------------------------
 ## Testing
 ##--------------------------------------------------------------------------------------------------

15_virtual_mem_part2_mmio_remap/Cargo.toml

@@ -7,17 +7,24 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 qemu-exit = "1.0.x"
 test-types = { path = "test-types" }
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
 
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+
 ##--------------------------------------------------------------------------------------------------
 ## Testing
 ##--------------------------------------------------------------------------------------------------

X1_JTAG_boot/Cargo.toml

@@ -7,11 +7,19 @@ edition = "2018"
 # The features section is used to select the target board.
 [features]
 default = []
-bsp_rpi3 = ["cortex-a", "register"]
+bsp_rpi3 = ["register"]
-bsp_rpi4 = ["cortex-a", "register"]
+bsp_rpi4 = ["register"]
+
+##--------------------------------------------------------------------------------------------------
+## Dependencies
+##--------------------------------------------------------------------------------------------------
 
 [dependencies]
 
 # Optional dependencies
-cortex-a = { version = "4.x.x", optional = true }
 register = { version = "0.5.x", optional = true }
+
+# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "4.x.x" }
+