Address reviews

12 files changed, 7 insertions, 16 deletions

diff --git a/examples/boot-usb-dfu/.cargo/config.toml b/examples/boot-usb-dfu/.cargo/config.toml
deleted file mode 100644
index de3a814f7..000000000
--- a/examples/boot-usb-dfu/.cargo/config.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[unstable]
-build-std = ["core"]
-build-std-features = ["panic_immediate_abort"]
-
-[build]
-target = "thumbv7em-none-eabi"
-
-[env]
-DEFMT_LOG = "trace"
diff --git a/examples/boot-usb-dfu/application/stm32wb/.cargo/config.toml b/examples/boot/application/stm32wb-dfu/.cargo/config.toml
index 4f8094ff2..4f8094ff2 100644
--- a/examples/boot-usb-dfu/application/stm32wb/.cargo/config.toml
+++ b/examples/boot/application/stm32wb-dfu/.cargo/config.toml
diff --git a/examples/boot-usb-dfu/application/stm32wb/Cargo.toml b/examples/boot/application/stm32wb-dfu/Cargo.toml
index 0a41c0648..e67224ce6 100644
--- a/examples/boot-usb-dfu/application/stm32wb/Cargo.toml
+++ b/examples/boot/application/stm32wb-dfu/Cargo.toml
@@ -25,6 +25,7 @@ cortex-m-rt = "0.7.0"
 [features]
 defmt = [
       "dep:defmt",
+      "dep:defmt-rtt",
       "embassy-stm32/defmt",
       "embassy-boot-stm32/defmt",
       "embassy-sync/defmt",
diff --git a/examples/boot-usb-dfu/application/stm32wb/README.md b/examples/boot/application/stm32wb-dfu/README.md
index c8dce0387..c8dce0387 100644
--- a/examples/boot-usb-dfu/application/stm32wb/README.md
+++ b/examples/boot/application/stm32wb-dfu/README.md
diff --git a/examples/boot-usb-dfu/application/stm32wb/build.rs b/examples/boot/application/stm32wb-dfu/build.rs
index e1da69328..e1da69328 100644
--- a/examples/boot-usb-dfu/application/stm32wb/build.rs
+++ b/examples/boot/application/stm32wb-dfu/build.rs
diff --git a/examples/boot-usb-dfu/application/stm32wb/memory.x b/examples/boot/application/stm32wb-dfu/memory.x
index f51875766..f51875766 100644
--- a/examples/boot-usb-dfu/application/stm32wb/memory.x
+++ b/examples/boot/application/stm32wb-dfu/memory.x
diff --git a/examples/boot-usb-dfu/application/stm32wb/src/main.rs b/examples/boot/application/stm32wb-dfu/src/main.rs
index f03003ffe..f03003ffe 100644
--- a/examples/boot-usb-dfu/application/stm32wb/src/main.rs
+++ b/examples/boot/application/stm32wb-dfu/src/main.rs
diff --git a/examples/boot-usb-dfu/bootloader/stm32wb/Cargo.toml b/examples/boot/bootloader/stm32wb-dfu/Cargo.toml
index 774a8223d..774a8223d 100644
--- a/examples/boot-usb-dfu/bootloader/stm32wb/Cargo.toml
+++ b/examples/boot/bootloader/stm32wb-dfu/Cargo.toml
diff --git a/examples/boot-usb-dfu/bootloader/stm32wb/README.md b/examples/boot/bootloader/stm32wb-dfu/README.md
index a82b730b9..a82b730b9 100644
--- a/examples/boot-usb-dfu/bootloader/stm32wb/README.md
+++ b/examples/boot/bootloader/stm32wb-dfu/README.md
diff --git a/examples/boot-usb-dfu/bootloader/stm32wb/build.rs b/examples/boot/bootloader/stm32wb-dfu/build.rs
index fd605991f..fd605991f 100644
--- a/examples/boot-usb-dfu/bootloader/stm32wb/build.rs
+++ b/examples/boot/bootloader/stm32wb-dfu/build.rs
diff --git a/examples/boot-usb-dfu/bootloader/stm32wb/memory.x b/examples/boot/bootloader/stm32wb-dfu/memory.x
index b6f185ef7..b6f185ef7 100644
--- a/examples/boot-usb-dfu/bootloader/stm32wb/memory.x
+++ b/examples/boot/bootloader/stm32wb-dfu/memory.x
diff --git a/examples/boot-usb-dfu/bootloader/stm32wb/src/main.rs b/examples/boot/bootloader/stm32wb-dfu/src/main.rs
index 00a535d35..a2b884770 100644
--- a/examples/boot-usb-dfu/bootloader/stm32wb/src/main.rs
+++ b/examples/boot/bootloader/stm32wb-dfu/src/main.rs
@@ -26,13 +26,12 @@ fn main() -> ! {
     config.rcc = WPAN_DEFAULT;
     let p = embassy_stm32::init(config);
 
-    // Uncomment this if you are debugging the bootloader with debugger/RTT attached,
-    // as it prevents a hard fault when accessing flash 'too early' after boot.
-    /*
-        for i in 0..10000000 {
-            cortex_m::asm::nop();
-        }
-    */
+    // Prevent a hard fault when accessing flash 'too early' after boot.
+    #[cfg(feature = "defmt")]
+    for _ in 0..10000000 {
+        cortex_m::asm::nop();
+    }
+    
 
     let layout = Flash::new_blocking(p.FLASH).into_blocking_regions();
     let flash = Mutex::new(RefCell::new(layout.bank1_region));