5 files changed, 30 insertions, 2 deletions

diff --git a/ci.sh b/ci.sh
index 842215a6b..4f8845158 100755
--- a/ci.sh
+++ b/ci.sh
@@ -264,6 +264,7 @@ cargo batch \
     --- build --release --manifest-path examples/stm32wba/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/stm32wba \
     --- build --release --manifest-path examples/stm32wl/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/stm32wl \
     --- build --release --manifest-path examples/lpc55s69/Cargo.toml --target thumbv8m.main-none-eabihf --artifact-dir out/examples/lpc55s69 \
+    --- build --release --manifest-path examples/lpc55s69/Cargo.toml --target thumbv8m.main-none-eabihf --features embassy-nxp/log-to-defmt --artifact-dir out/examples/lpc55s69 \    
     --- build --release --manifest-path examples/mspm0g3507/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0g3507 \
     --- build --release --manifest-path examples/mspm0g3519/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0g3519 \
     --- build --release --manifest-path examples/mspm0l1306/Cargo.toml --target thumbv6m-none-eabi --artifact-dir out/examples/mspm0l1306 \
diff --git a/embassy-nxp/Cargo.toml b/embassy-nxp/Cargo.toml
index 01f57c4e2..9eb48be17 100644
--- a/embassy-nxp/Cargo.toml
+++ b/embassy-nxp/Cargo.toml
@@ -10,6 +10,8 @@ critical-section = "1.1.2"
 embassy-hal-internal = { version = "0.3.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-2"] }
 embassy-sync = { version = "0.7.0", path = "../embassy-sync" }
 defmt = { version = "1", optional = true }
+log = "0.4.27"
+log-to-defmt = { version = "0.1.0", optional = true}
 
 ## Chip dependencies
 lpc55-pac = { version = "0.5.0", optional = true }
@@ -30,3 +32,5 @@ unstable-pac = []
 
 #! ### Chip selection features
 lpc55 = ["lpc55-pac"]
+## Enable debug logs
+log-to-defmt = ["dep:log-to-defmt"]
diff --git a/embassy-nxp/src/lib.rs b/embassy-nxp/src/lib.rs
index 433aca9e0..79c66e7f6 100644
--- a/embassy-nxp/src/lib.rs
+++ b/embassy-nxp/src/lib.rs
@@ -3,7 +3,6 @@
 pub mod gpio;
 #[cfg(feature = "lpc55")]
 pub mod pint;
-
 // This mod MUST go last, so that it sees all the `impl_foo!` macros
 #[cfg_attr(feature = "lpc55", path = "chips/lpc55.rs")]
 mod chip;
@@ -25,8 +24,10 @@ pub fn init(_config: config::Config) -> Peripherals {
     {
         gpio::init();
         pint::init();
+        #[cfg(feature = "log-to-defmt")]
+        log_to_defmt::setup();
+        log::info!("Initialization complete");
     }
-
     crate::Peripherals::take()
 }
 
diff --git a/examples/lpc55s69/Cargo.toml b/examples/lpc55s69/Cargo.toml
index 6ec6e51a8..7e3b82432 100644
--- a/examples/lpc55s69/Cargo.toml
+++ b/examples/lpc55s69/Cargo.toml
@@ -18,5 +18,9 @@ defmt-rtt = "1.0.0"
 panic-probe = { version = "1.0.0", features = ["print-defmt"] }
 panic-semihosting = "0.6.0"
 
+[features]
+## To test all-logs mode
+log-to-defmt = ["embassy-nxp/log-to-defmt"]
+
 [profile.release]
 debug = 2
diff --git a/examples/lpc55s69/src/bin/log_to_defmt.rs b/examples/lpc55s69/src/bin/log_to_defmt.rs
new file mode 100644
index 000000000..7aaab5e54
--- /dev/null
+++ b/examples/lpc55s69/src/bin/log_to_defmt.rs
@@ -0,0 +1,18 @@
+/// To test log-to-defmt feature, you have to run the binary file with the corresponding flag
+/// Example: cargo run --bin <file> --feature log-to-defmt
+
+
+#![no_std]
+#![no_main]
+
+use log::*;
+use embassy_executor::Spawner;
+use {defmt_rtt as _, panic_halt as _};
+
+#[embassy_executor::main]
+async fn main(_spawner: Spawner) {
+    info!("Hello World");
+    loop{
+        info!("Another test");
+    }   
+}