diff --git a/Cargo.lock b/Cargo.lock
index eba8c98..0621cca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -643,22 +643,11 @@ dependencies = [
 
 [[package]]
 name = "rtt-logger"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d082d3a20a5d4f69ad509720de1777fe5aa2092ea1af51b254ff79113d46d2ea"
+version = "0.1.1"
+source = "git+https://github.com/quartiq/rtt-logger.git?rev=70b0eb5#70b0eb587fa43902aaf58296fe866418a1f4e920"
 dependencies = [
  "log",
- "rtt-target 0.2.2",
-]
-
-[[package]]
-name = "rtt-target"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0869b4c5b6a6d8c5583fc473f9eb3423a170f77626b8c8a7fb18eddcda5770e2"
-dependencies = [
- "cortex-m 0.6.7",
- "ufmt-write",
+ "rtt-target",
 ]
 
 [[package]]
@@ -770,7 +759,7 @@ version = "0.5.0"
 dependencies = [
  "ad9959",
  "asm-delay",
- "cortex-m 0.6.7",
+ "cortex-m 0.7.2",
  "cortex-m-rt",
  "cortex-m-rtic",
  "dsp",
@@ -784,7 +773,7 @@ dependencies = [
  "num_enum",
  "paste",
  "rtt-logger",
- "rtt-target 0.3.1",
+ "rtt-target",
  "serde",
  "serde-json-core",
  "shared-bus",
diff --git a/Cargo.toml b/Cargo.toml
index 7ea035a..fbbb87b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,11 +28,10 @@ default-target = "thumbv7em-none-eabihf"
 members = ["ad9959", "dsp"]
 
 [dependencies]
-cortex-m = { version = "0.6", features = ["const-fn"] }
+cortex-m = { version = "0.7" }
 cortex-m-rt = { version = "0.6", features = ["device"] }
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_info"] }
-rtt-target = { version = "0.3.1", features = ["cortex-m"] }
-rtt-logger = { version = "0.1" }
+rtt-target = { version = "0.3", features = ["cortex-m"] }
 serde = { version = "1.0", features = ["derive"], default-features = false }
 heapless = { version = "0.6", features = ["serde"] }
 cortex-m-rtic = "0.5.6"
@@ -47,6 +46,10 @@ miniconf = "0.1.0"
 shared-bus = {version = "0.2.2", features = ["cortex-m"] }
 serde-json-core = "0.3"
 
+[dependencies.rtt-logger]
+git = "https://github.com/quartiq/rtt-logger.git"
+rev = "70b0eb5"
+
 [dependencies.mcp23017]
 git = "https://github.com/mrd0ll4r/mcp23017.git"
 rev = "61933f857a"
@@ -68,7 +71,6 @@ git = "https://github.com/quartiq/minimq.git"
 rev = "d2ec3e8"
 
 [features]
-bkpt = [ ]
 nightly = ["cortex-m/inline-asm", "dsp/nightly"]
 pounder_v1_1 = [ ]
 
diff --git a/src/hardware/configuration.rs b/src/hardware/configuration.rs
index 6efd576..f48b3d2 100644
--- a/src/hardware/configuration.rs
+++ b/src/hardware/configuration.rs
@@ -153,7 +153,7 @@ pub fn setup(
         use rtt_logger::RTTLogger;
 
         static LOGGER: RTTLogger = RTTLogger::new(log::LevelFilter::Info);
-        rtt_target::rtt_init_print!(NoBlockSkip, 1024);
+        rtt_target::rtt_init_print!();
         log::set_logger(&LOGGER)
             .map(|()| log::set_max_level(log::LevelFilter::Trace))
             .unwrap();