Remove comment

04_zero_overhead_abstraction/README.md

@@ -53,7 +53,7 @@ diff -uNr 03_hacky_hello_world/src/_arch/aarch64/cpu/smp.rs 04_zero_overhead_abs
 diff -uNr 03_hacky_hello_world/src/_arch/aarch64/cpu.rs 04_zero_overhead_abstraction/src/_arch/aarch64/cpu.rs
 --- 03_hacky_hello_world/src/_arch/aarch64/cpu.rs
 +++ 04_zero_overhead_abstraction/src/_arch/aarch64/cpu.rs
-@@ -4,8 +4,35 @@
+@@ -4,8 +4,34 @@
 
  //! Architectural processor code.
 
@@ -79,7 +79,6 @@ diff -uNr 03_hacky_hello_world/src/_arch/aarch64/cpu.rs 04_zero_overhead_abstrac
 +pub unsafe fn _start() -> ! {
 +    use crate::runtime_init;
 +
-+    // Expect the boot core to start in EL2.
 +    if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
 +        SP.set(bsp::memory::boot_core_stack_end() as u64);
 +        runtime_init::runtime_init()
@@ -91,7 +90,7 @@ diff -uNr 03_hacky_hello_world/src/_arch/aarch64/cpu.rs 04_zero_overhead_abstrac
 
  //--------------------------------------------------------------------------------------------------
  // Public Code
-@@ -14,13 +41,7 @@
+@@ -14,13 +40,7 @@
  /// Pause execution on the core.
  #[inline(always)]
  pub fn wait_forever() -> ! {

04_zero_overhead_abstraction/src/_arch/aarch64/cpu.rs

@@ -24,7 +24,6 @@ use cortex_a::{asm, regs::*};
 pub unsafe fn _start() -> ! {
     use crate::runtime_init;
 
-    // Expect the boot core to start in EL2.
     if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
         SP.set(bsp::memory::boot_core_stack_end() as u64);
         runtime_init::runtime_init()

05_safe_globals/src/_arch/aarch64/cpu.rs

@@ -24,7 +24,6 @@ use cortex_a::{asm, regs::*};
 pub unsafe fn _start() -> ! {
     use crate::runtime_init;
 
-    // Expect the boot core to start in EL2.
     if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
         SP.set(bsp::memory::boot_core_stack_end() as u64);
         runtime_init::runtime_init()

06_drivers_gpio_uart/README.md

@@ -185,7 +185,7 @@ diff -uNr 05_safe_globals/Makefile 06_drivers_gpio_uart/Makefile
 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
 +++ 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs
-@@ -38,6 +38,17 @@
+@@ -37,6 +37,17 @@
  // Public Code
  //--------------------------------------------------------------------------------------------------
 

06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs

@@ -24,7 +24,6 @@ use cortex_a::{asm, regs::*};
 pub unsafe fn _start() -> ! {
     use crate::runtime_init;
 
-    // Expect the boot core to start in EL2.
     if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
         SP.set(bsp::memory::boot_core_stack_end() as u64);
         runtime_init::runtime_init()

07_uart_chainloader/README.md

@@ -183,14 +183,13 @@ diff -uNr 06_drivers_gpio_uart/Makefile 07_uart_chainloader/Makefile
 diff -uNr 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs 07_uart_chainloader/src/_arch/aarch64/cpu.rs
 --- 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs
 +++ 07_uart_chainloader/src/_arch/aarch64/cpu.rs
-@@ -22,12 +22,12 @@
+@@ -22,11 +22,11 @@
  ///   actually set (`SP.set()`).
  #[no_mangle]
  pub unsafe fn _start() -> ! {
 -    use crate::runtime_init;
 +    use crate::relocate;
 
-     // Expect the boot core to start in EL2.
      if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
          SP.set(bsp::memory::boot_core_stack_end() as u64);
 -        runtime_init::runtime_init()
@@ -198,7 +197,7 @@ diff -uNr 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs 07_uart_chainloader/src/
      } else {
          // If not core0, infinitely wait for events.
          wait_forever()
-@@ -56,3 +56,19 @@
+@@ -55,3 +55,19 @@
          asm::wfe()
      }
  }

07_uart_chainloader/src/_arch/aarch64/cpu.rs

@@ -24,7 +24,6 @@ use cortex_a::{asm, regs::*};
 pub unsafe fn _start() -> ! {
     use crate::relocate;
 
-    // Expect the boot core to start in EL2.
     if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
         SP.set(bsp::memory::boot_core_stack_end() as u64);
         relocate::relocate_self()

08_timestamps/README.md

@@ -115,14 +115,13 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile
 diff -uNr 07_uart_chainloader/src/_arch/aarch64/cpu.rs 08_timestamps/src/_arch/aarch64/cpu.rs
 --- 07_uart_chainloader/src/_arch/aarch64/cpu.rs
 +++ 08_timestamps/src/_arch/aarch64/cpu.rs
-@@ -22,12 +22,12 @@
+@@ -22,11 +22,11 @@
  ///   actually set (`SP.set()`).
  #[no_mangle]
  pub unsafe fn _start() -> ! {
 -    use crate::relocate;
 +    use crate::runtime_init;
 
-     // Expect the boot core to start in EL2.
      if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
          SP.set(bsp::memory::boot_core_stack_end() as u64);
 -        relocate::relocate_self()
@@ -130,7 +129,7 @@ diff -uNr 07_uart_chainloader/src/_arch/aarch64/cpu.rs 08_timestamps/src/_arch/a
      } else {
          // If not core0, infinitely wait for events.
          wait_forever()
-@@ -40,15 +40,6 @@
+@@ -39,15 +39,6 @@
 
  pub use asm::nop;
 
@@ -146,7 +145,7 @@ diff -uNr 07_uart_chainloader/src/_arch/aarch64/cpu.rs 08_timestamps/src/_arch/a
  /// Pause execution on the core.
  #[inline(always)]
  pub fn wait_forever() -> ! {
-@@ -56,19 +47,3 @@
+@@ -55,19 +46,3 @@
          asm::wfe()
      }
  }

08_timestamps/src/_arch/aarch64/cpu.rs

@@ -24,7 +24,6 @@ use cortex_a::{asm, regs::*};
 pub unsafe fn _start() -> ! {
     use crate::runtime_init;
 
-    // Expect the boot core to start in EL2.
     if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
         SP.set(bsp::memory::boot_core_stack_end() as u64);
         runtime_init::runtime_init()

09_hw_debug_JTAG/src/_arch/aarch64/cpu.rs

@@ -24,7 +24,6 @@ use cortex_a::{asm, regs::*};
 pub unsafe fn _start() -> ! {
     use crate::runtime_init;
 
-    // Expect the boot core to start in EL2.
     if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
         SP.set(bsp::memory::boot_core_stack_end() as u64);
         runtime_init::runtime_init()

10_privilege_level/README.md

@@ -226,7 +226,7 @@ Minipush 1.0
 diff -uNr 09_hw_debug_JTAG/src/_arch/aarch64/cpu.rs 10_privilege_level/src/_arch/aarch64/cpu.rs
 --- 09_hw_debug_JTAG/src/_arch/aarch64/cpu.rs
 +++ 10_privilege_level/src/_arch/aarch64/cpu.rs
-@@ -18,22 +18,65 @@
+@@ -18,21 +18,65 @@
  /// # Safety
  ///
  /// - Linker script must ensure to place this function where it is expected by the target machine.
@@ -238,10 +238,10 @@ diff -uNr 09_hw_debug_JTAG/src/_arch/aarch64/cpu.rs 10_privilege_level/src/_arch
  pub unsafe fn _start() -> ! {
 -    use crate::runtime_init;
 -
-     // Expect the boot core to start in EL2.
 -    if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
 -        SP.set(bsp::memory::boot_core_stack_end() as u64);
 -        runtime_init::runtime_init()
++    // Expect the boot core to start in EL2.
 +    if (bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id())
 +        && (CurrentEL.get() == CurrentEL::EL::EL2.value)
 +    {