diff --git a/.rustfmt.toml b/.rustfmt.toml
index 25a74537..5e98361e 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,6 +1,6 @@
 newline_style = "Unix"
 edition = "2018"
-merge_imports = true
+imports_granularity = "Crate"
 format_code_in_doc_comments = true
 normalize_comments = true
 wrap_comments = true
diff --git a/06_drivers_gpio_uart/README.md b/06_drivers_gpio_uart/README.md
index 9bb29be5..a4176ca5 100644
--- a/06_drivers_gpio_uart/README.md
+++ b/06_drivers_gpio_uart/README.md
@@ -1302,15 +1302,16 @@ diff -uNr 05_safe_globals/src/driver.rs 06_drivers_gpio_uart/src/driver.rs
 diff -uNr 05_safe_globals/src/main.rs 06_drivers_gpio_uart/src/main.rs
 --- 05_safe_globals/src/main.rs
 +++ 06_drivers_gpio_uart/src/main.rs
-@@ -107,6 +107,7 @@
+@@ -107,6 +107,8 @@
  //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
  //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
++#![allow(clippy::clippy::upper_case_acronyms)]
 +#![feature(const_fn_fn_ptr_basics)]
  #![feature(format_args_nl)]
  #![feature(panic_info_message)]
  #![feature(trait_alias)]
-@@ -116,6 +117,7 @@
+@@ -116,6 +118,7 @@
  mod bsp;
  mod console;
  mod cpu;
@@ -1318,7 +1319,7 @@ diff -uNr 05_safe_globals/src/main.rs 06_drivers_gpio_uart/src/main.rs
  mod memory;
  mod panic_wait;
  mod print;
-@@ -127,16 +129,49 @@
+@@ -127,16 +130,49 @@
  /// # Safety
  ///
  /// - Only a single core must be active and running this function.
diff --git a/06_drivers_gpio_uart/src/main.rs b/06_drivers_gpio_uart/src/main.rs
index 46a89031..627b5b59 100644
--- a/06_drivers_gpio_uart/src/main.rs
+++ b/06_drivers_gpio_uart/src/main.rs
@@ -107,6 +107,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(format_args_nl)]
 #![feature(panic_info_message)]
diff --git a/07_uart_chainloader/README.md b/07_uart_chainloader/README.md
index 4cf6d918..91242143 100644
--- a/07_uart_chainloader/README.md
+++ b/07_uart_chainloader/README.md
@@ -406,7 +406,7 @@ diff -uNr 06_drivers_gpio_uart/src/cpu.rs 07_uart_chainloader/src/cpu.rs
 diff -uNr 06_drivers_gpio_uart/src/main.rs 07_uart_chainloader/src/main.rs
 --- 06_drivers_gpio_uart/src/main.rs
 +++ 07_uart_chainloader/src/main.rs
-@@ -102,12 +102,16 @@
+@@ -102,13 +102,17 @@
  //!
  //! 1. The kernel's entry point is the function [`cpu::boot::arch_boot::_start()`].
  //!     - It is implemented in `src/_arch/__arch_name__/cpu/boot.rs`.
@@ -418,13 +418,14 @@ diff -uNr 06_drivers_gpio_uart/src/main.rs 07_uart_chainloader/src/main.rs
 +//! [`relocate::relocate_self()`]: relocate/fn.relocate_self.html
  //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+ #![allow(clippy::clippy::upper_case_acronyms)]
 +#![feature(asm)]
  #![feature(const_fn_fn_ptr_basics)]
 +#![feature(core_intrinsics)]
  #![feature(format_args_nl)]
  #![feature(panic_info_message)]
  #![feature(trait_alias)]
-@@ -121,6 +125,7 @@
+@@ -122,6 +126,7 @@
  mod memory;
  mod panic_wait;
  mod print;
@@ -432,7 +433,7 @@ diff -uNr 06_drivers_gpio_uart/src/main.rs 07_uart_chainloader/src/main.rs
  mod runtime_init;
  mod synchronization;
 
-@@ -149,29 +154,49 @@
+@@ -150,29 +155,49 @@
  fn kernel_main() -> ! {
      use bsp::console::console;
      use console::interface::All;
diff --git a/07_uart_chainloader/demo_payload_rpi3.img b/07_uart_chainloader/demo_payload_rpi3.img
index 83fe7bff..13cf8aa1 100755
Binary files a/07_uart_chainloader/demo_payload_rpi3.img and b/07_uart_chainloader/demo_payload_rpi3.img differ
diff --git a/07_uart_chainloader/demo_payload_rpi4.img b/07_uart_chainloader/demo_payload_rpi4.img
index f2dec5cb..a0b618f8 100755
Binary files a/07_uart_chainloader/demo_payload_rpi4.img and b/07_uart_chainloader/demo_payload_rpi4.img differ
diff --git a/07_uart_chainloader/src/main.rs b/07_uart_chainloader/src/main.rs
index 82a6ec58..4fc6449a 100644
--- a/07_uart_chainloader/src/main.rs
+++ b/07_uart_chainloader/src/main.rs
@@ -109,6 +109,7 @@
 //! [`relocate::relocate_self()`]: relocate/fn.relocate_self.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![feature(asm)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(core_intrinsics)]
diff --git a/08_timestamps/README.md b/08_timestamps/README.md
index af4b8055..43c16538 100644
--- a/08_timestamps/README.md
+++ b/08_timestamps/README.md
@@ -499,7 +499,7 @@ diff -uNr 07_uart_chainloader/src/cpu.rs 08_timestamps/src/cpu.rs
 diff -uNr 07_uart_chainloader/src/main.rs 08_timestamps/src/main.rs
 --- 07_uart_chainloader/src/main.rs
 +++ 08_timestamps/src/main.rs
-@@ -102,16 +102,12 @@
+@@ -102,17 +102,13 @@
  //!
  //! 1. The kernel's entry point is the function [`cpu::boot::arch_boot::_start()`].
  //!     - It is implemented in `src/_arch/__arch_name__/cpu/boot.rs`.
@@ -511,13 +511,14 @@ diff -uNr 07_uart_chainloader/src/main.rs 08_timestamps/src/main.rs
 -//! [`relocate::relocate_self()`]: relocate/fn.relocate_self.html
  //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+ #![allow(clippy::clippy::upper_case_acronyms)]
 -#![feature(asm)]
  #![feature(const_fn_fn_ptr_basics)]
 -#![feature(core_intrinsics)]
  #![feature(format_args_nl)]
  #![feature(panic_info_message)]
  #![feature(trait_alias)]
-@@ -125,9 +121,9 @@
+@@ -126,9 +122,9 @@
  mod memory;
  mod panic_wait;
  mod print;
@@ -528,7 +529,7 @@ diff -uNr 07_uart_chainloader/src/main.rs 08_timestamps/src/main.rs
 
  /// Early init code.
  ///
-@@ -152,51 +148,31 @@
+@@ -153,51 +149,31 @@
 
  /// The main function running after the early init.
  fn kernel_main() -> ! {
diff --git a/08_timestamps/src/main.rs b/08_timestamps/src/main.rs
index efcd9880..14e1d0ab 100644
--- a/08_timestamps/src/main.rs
+++ b/08_timestamps/src/main.rs
@@ -107,6 +107,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(format_args_nl)]
 #![feature(panic_info_message)]
diff --git a/09_hw_debug_JTAG/src/main.rs b/09_hw_debug_JTAG/src/main.rs
index efcd9880..14e1d0ab 100644
--- a/09_hw_debug_JTAG/src/main.rs
+++ b/09_hw_debug_JTAG/src/main.rs
@@ -107,6 +107,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(format_args_nl)]
 #![feature(panic_info_message)]
diff --git a/10_privilege_level/README.md b/10_privilege_level/README.md
index 2e88c083..0d58e281 100644
--- a/10_privilege_level/README.md
+++ b/10_privilege_level/README.md
@@ -484,7 +484,7 @@ diff -uNr 09_hw_debug_JTAG/src/exception.rs 10_privilege_level/src/exception.rs
 diff -uNr 09_hw_debug_JTAG/src/main.rs 10_privilege_level/src/main.rs
 --- 09_hw_debug_JTAG/src/main.rs
 +++ 10_privilege_level/src/main.rs
-@@ -118,6 +118,7 @@
+@@ -119,6 +119,7 @@
  mod console;
  mod cpu;
  mod driver;
@@ -492,7 +492,7 @@ diff -uNr 09_hw_debug_JTAG/src/main.rs 10_privilege_level/src/main.rs
  mod memory;
  mod panic_wait;
  mod print;
-@@ -148,12 +149,20 @@
+@@ -149,12 +150,20 @@
 
  /// The main function running after the early init.
  fn kernel_main() -> ! {
@@ -513,7 +513,7 @@ diff -uNr 09_hw_debug_JTAG/src/main.rs 10_privilege_level/src/main.rs
      info!(
          "Architectural timer resolution: {} ns",
          time::time_manager().resolution().as_nanos()
-@@ -168,11 +177,15 @@
+@@ -169,11 +178,15 @@
          info!("      {}. {}", i + 1, driver.compatible());
      }
 
diff --git a/10_privilege_level/src/main.rs b/10_privilege_level/src/main.rs
index 193ff7a6..181a9aa5 100644
--- a/10_privilege_level/src/main.rs
+++ b/10_privilege_level/src/main.rs
@@ -107,6 +107,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(format_args_nl)]
 #![feature(panic_info_message)]
diff --git a/11_virtual_mem_part1_identity_mapping/README.md b/11_virtual_mem_part1_identity_mapping/README.md
index 726012e1..7b822f68 100644
--- a/11_virtual_mem_part1_identity_mapping/README.md
+++ b/11_virtual_mem_part1_identity_mapping/README.md
@@ -1006,10 +1006,10 @@ diff -uNr 10_privilege_level/src/bsp.rs 11_virtual_mem_part1_identity_mapping/sr
 diff -uNr 10_privilege_level/src/main.rs 11_virtual_mem_part1_identity_mapping/src/main.rs
 --- 10_privilege_level/src/main.rs
 +++ 11_virtual_mem_part1_identity_mapping/src/main.rs
-@@ -107,7 +107,10 @@
- //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
+@@ -108,7 +108,10 @@
  //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+ #![allow(clippy::clippy::upper_case_acronyms)]
 +#![allow(incomplete_features)]
  #![feature(const_fn_fn_ptr_basics)]
 +#![feature(const_generics)]
@@ -1017,7 +1017,7 @@ diff -uNr 10_privilege_level/src/main.rs 11_virtual_mem_part1_identity_mapping/s
  #![feature(format_args_nl)]
  #![feature(panic_info_message)]
  #![feature(trait_alias)]
-@@ -131,9 +134,18 @@
+@@ -132,9 +135,18 @@
  /// # Safety
  ///
  /// - Only a single core must be active and running this function.
@@ -1037,7 +1037,7 @@ diff -uNr 10_privilege_level/src/main.rs 11_virtual_mem_part1_identity_mapping/s
 
      for i in bsp::driver::driver_manager().all_device_drivers().iter() {
          if let Err(x) = i.init() {
-@@ -157,6 +169,9 @@
+@@ -158,6 +170,9 @@
 
      info!("Booting on: {}", bsp::board_name());
 
@@ -1047,7 +1047,7 @@ diff -uNr 10_privilege_level/src/main.rs 11_virtual_mem_part1_identity_mapping/s
      let (_, privilege_level) = exception::current_privilege_level();
      info!("Current privilege level: {}", privilege_level);
 
-@@ -180,6 +195,13 @@
+@@ -181,6 +196,13 @@
      info!("Timer test, spinning for 1 second");
      time::time_manager().spin_for(Duration::from_secs(1));
 
diff --git a/11_virtual_mem_part1_identity_mapping/src/main.rs b/11_virtual_mem_part1_identity_mapping/src/main.rs
index bfc7d5e4..9f755c9b 100644
--- a/11_virtual_mem_part1_identity_mapping/src/main.rs
+++ b/11_virtual_mem_part1_identity_mapping/src/main.rs
@@ -107,6 +107,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![allow(incomplete_features)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(const_generics)]
diff --git a/12_exceptions_part1_groundwork/README.md b/12_exceptions_part1_groundwork/README.md
index c5d0f9f1..53c953df 100644
--- a/12_exceptions_part1_groundwork/README.md
+++ b/12_exceptions_part1_groundwork/README.md
@@ -967,7 +967,7 @@ diff -uNr 11_virtual_mem_part1_identity_mapping/src/exception.rs 12_exceptions_p
 diff -uNr 11_virtual_mem_part1_identity_mapping/src/main.rs 12_exceptions_part1_groundwork/src/main.rs
 --- 11_virtual_mem_part1_identity_mapping/src/main.rs
 +++ 12_exceptions_part1_groundwork/src/main.rs
-@@ -112,6 +112,7 @@
+@@ -113,6 +113,7 @@
  #![feature(const_generics)]
  #![feature(const_panic)]
  #![feature(format_args_nl)]
@@ -975,7 +975,7 @@ diff -uNr 11_virtual_mem_part1_identity_mapping/src/main.rs 12_exceptions_part1_
  #![feature(panic_info_message)]
  #![feature(trait_alias)]
  #![no_main]
-@@ -143,6 +144,8 @@
+@@ -144,6 +145,8 @@
      use driver::interface::DriverManager;
      use memory::mmu::interface::MMU;
 
@@ -984,7 +984,7 @@ diff -uNr 11_virtual_mem_part1_identity_mapping/src/main.rs 12_exceptions_part1_
      if let Err(string) = memory::mmu::mmu().init() {
          panic!("MMU: {}", string);
      }
-@@ -195,13 +198,28 @@
+@@ -196,13 +199,28 @@
      info!("Timer test, spinning for 1 second");
      time::time_manager().spin_for(Duration::from_secs(1));
 
diff --git a/12_exceptions_part1_groundwork/src/main.rs b/12_exceptions_part1_groundwork/src/main.rs
index 4aa47c6e..9dee3a44 100644
--- a/12_exceptions_part1_groundwork/src/main.rs
+++ b/12_exceptions_part1_groundwork/src/main.rs
@@ -107,6 +107,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![allow(incomplete_features)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(const_generics)]
diff --git a/13_integrated_testing/README.md b/13_integrated_testing/README.md
index cd03c27e..383b0a0d 100644
--- a/13_integrated_testing/README.md
+++ b/13_integrated_testing/README.md
@@ -1157,7 +1157,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/exception.rs 13_integrated_testing/
 diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/lib.rs
 --- 12_exceptions_part1_groundwork/src/lib.rs
 +++ 13_integrated_testing/src/lib.rs
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,170 @@
 +// SPDX-License-Identifier: MIT OR Apache-2.0
 +//
 +// Copyright (c) 2018-2021 Andre Richter <andre.o.richter@gmail.com>
@@ -1269,6 +1269,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/li
 +//! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 +//! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 +
++#![allow(clippy::clippy::upper_case_acronyms)]
 +#![allow(incomplete_features)]
 +#![feature(const_fn_fn_ptr_basics)]
 +#![feature(const_generics)]
@@ -1331,7 +1332,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/li
 diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/main.rs
 --- 12_exceptions_part1_groundwork/src/main.rs
 +++ 13_integrated_testing/src/main.rs
-@@ -6,129 +6,12 @@
+@@ -6,130 +6,12 @@
  #![doc(html_logo_url = "https://git.io/JeGIp")]
 
  //! The `kernel` binary.
@@ -1436,6 +1437,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
 -//! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 -//! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 -
+-#![allow(clippy::clippy::upper_case_acronyms)]
 -#![allow(incomplete_features)]
 -#![feature(const_fn_fn_ptr_basics)]
 -#![feature(const_generics)]
@@ -1463,7 +1465,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
 
  /// Early init code.
  ///
-@@ -140,6 +23,7 @@
+@@ -141,6 +23,7 @@
  ///       - Without it, any atomic operations, e.g. the yet-to-be-introduced spinlocks in the device
  ///         drivers (which currently employ NullLocks instead of spinlocks), will fail to work on
  ///         the RPi SoCs.
@@ -1471,7 +1473,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
  unsafe fn kernel_init() -> ! {
      use driver::interface::DriverManager;
      use memory::mmu::interface::MMU;
-@@ -166,9 +50,7 @@
+@@ -167,9 +50,7 @@
  fn kernel_main() -> ! {
      use bsp::console::console;
      use console::interface::All;
@@ -1481,7 +1483,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
 
      info!("Booting on: {}", bsp::board_name());
 
-@@ -195,31 +77,6 @@
+@@ -196,31 +77,6 @@
          info!("      {}. {}", i + 1, driver.compatible());
      }
 
diff --git a/13_integrated_testing/src/lib.rs b/13_integrated_testing/src/lib.rs
index d427375c..3e0a9eea 100644
--- a/13_integrated_testing/src/lib.rs
+++ b/13_integrated_testing/src/lib.rs
@@ -109,6 +109,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![allow(incomplete_features)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(const_generics)]
diff --git a/14_exceptions_part2_peripheral_IRQs/README.md b/14_exceptions_part2_peripheral_IRQs/README.md
index 060a58e2..c04cc9ae 100644
--- a/14_exceptions_part2_peripheral_IRQs/README.md
+++ b/14_exceptions_part2_peripheral_IRQs/README.md
@@ -2296,9 +2296,9 @@ diff -uNr 13_integrated_testing/src/exception/asynchronous.rs 14_exceptions_part
 diff -uNr 13_integrated_testing/src/lib.rs 14_exceptions_part2_peripheral_IRQs/src/lib.rs
 --- 13_integrated_testing/src/lib.rs
 +++ 14_exceptions_part2_peripheral_IRQs/src/lib.rs
-@@ -110,9 +110,11 @@
- //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
+@@ -111,9 +111,11 @@
 
+ #![allow(clippy::clippy::upper_case_acronyms)]
  #![allow(incomplete_features)]
 +#![feature(asm)]
  #![feature(const_fn_fn_ptr_basics)]
@@ -2308,7 +2308,7 @@ diff -uNr 13_integrated_testing/src/lib.rs 14_exceptions_part2_peripheral_IRQs/s
  #![feature(format_args_nl)]
  #![feature(global_asm)]
  #![feature(linkage)]
-@@ -136,6 +138,7 @@
+@@ -137,6 +139,7 @@
  pub mod exception;
  pub mod memory;
  pub mod print;
diff --git a/14_exceptions_part2_peripheral_IRQs/src/lib.rs b/14_exceptions_part2_peripheral_IRQs/src/lib.rs
index 2d12290f..fd4bdde5 100644
--- a/14_exceptions_part2_peripheral_IRQs/src/lib.rs
+++ b/14_exceptions_part2_peripheral_IRQs/src/lib.rs
@@ -109,6 +109,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![allow(incomplete_features)]
 #![feature(asm)]
 #![feature(const_fn_fn_ptr_basics)]
diff --git a/15_virtual_mem_part2_mmio_remap/Makefile b/15_virtual_mem_part2_mmio_remap/Makefile
index 4f7561db..206b3d97 100644
--- a/15_virtual_mem_part2_mmio_remap/Makefile
+++ b/15_virtual_mem_part2_mmio_remap/Makefile
@@ -170,7 +170,7 @@ objdump: $(KERNEL_ELF)
 	@$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
 
 nm: $(KERNEL_ELF)
-	@$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
+	$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
 # For rust-analyzer
 check:
diff --git a/15_virtual_mem_part2_mmio_remap/README.md b/15_virtual_mem_part2_mmio_remap/README.md
index 9adbe9c2..65127bd6 100644
--- a/15_virtual_mem_part2_mmio_remap/README.md
+++ b/15_virtual_mem_part2_mmio_remap/README.md
@@ -1939,15 +1939,15 @@ diff -uNr 14_exceptions_part2_peripheral_IRQs/src/driver.rs 15_virtual_mem_part2
 diff -uNr 14_exceptions_part2_peripheral_IRQs/src/lib.rs 15_virtual_mem_part2_mmio_remap/src/lib.rs
 --- 14_exceptions_part2_peripheral_IRQs/src/lib.rs
 +++ 15_virtual_mem_part2_mmio_remap/src/lib.rs
-@@ -111,6 +111,7 @@
-
+@@ -112,6 +112,7 @@
+ #![allow(clippy::clippy::upper_case_acronyms)]
  #![allow(incomplete_features)]
  #![feature(asm)]
 +#![feature(const_fn)]
  #![feature(const_fn_fn_ptr_basics)]
  #![feature(const_generics)]
  #![feature(const_panic)]
-@@ -132,6 +133,7 @@
+@@ -133,6 +134,7 @@
  mod synchronization;
 
  pub mod bsp;
diff --git a/15_virtual_mem_part2_mmio_remap/src/lib.rs b/15_virtual_mem_part2_mmio_remap/src/lib.rs
index a509d86f..608d4b07 100644
--- a/15_virtual_mem_part2_mmio_remap/src/lib.rs
+++ b/15_virtual_mem_part2_mmio_remap/src/lib.rs
@@ -109,6 +109,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![allow(incomplete_features)]
 #![feature(asm)]
 #![feature(const_fn)]
diff --git a/X1_JTAG_boot/jtag_boot_rpi3.img b/X1_JTAG_boot/jtag_boot_rpi3.img
index 4cd44015..d4148b72 100755
Binary files a/X1_JTAG_boot/jtag_boot_rpi3.img and b/X1_JTAG_boot/jtag_boot_rpi3.img differ
diff --git a/X1_JTAG_boot/jtag_boot_rpi4.img b/X1_JTAG_boot/jtag_boot_rpi4.img
index c7535115..7c70a2c0 100755
Binary files a/X1_JTAG_boot/jtag_boot_rpi4.img and b/X1_JTAG_boot/jtag_boot_rpi4.img differ
diff --git a/X1_JTAG_boot/src/main.rs b/X1_JTAG_boot/src/main.rs
index 4f45d955..aeff7a4d 100644
--- a/X1_JTAG_boot/src/main.rs
+++ b/X1_JTAG_boot/src/main.rs
@@ -107,6 +107,7 @@
 //! [`cpu::boot::arch_boot::_start()`]: cpu/boot/arch_boot/fn._start.html
 //! [`runtime_init::runtime_init()`]: runtime_init/fn.runtime_init.html
 
+#![allow(clippy::clippy::upper_case_acronyms)]
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(format_args_nl)]
 #![feature(panic_info_message)]
diff --git a/rust-toolchain b/rust-toolchain
index 26668a71..1b5ba1c0 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2021-01-08"
+channel = "nightly-2021-03-06"
 components = ["llvm-tools-preview"]
 targets = ["aarch64-unknown-none-softfloat"]