diff --git a/.cargo/config b/.cargo/config
index a765d53..382c36e 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,5 +1,5 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = "gdb-multiarch -q -x bmp.gdb"
+runner = "gdb-multiarch -q -x openocd.gdb"
 rustflags = ["-C", "link-arg=-Tlink.x"]
 
 [build]
diff --git a/Cargo.lock b/Cargo.lock
index 829e231..3f6481a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -319,7 +319,7 @@ dependencies = [
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-json-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "stm32h7xx-hal 0.4.0",
+ "stm32h7xx-hal 0.4.0 (git+https://github.com/quartiq/stm32h7xx-hal.git?branch=feature/quad-spi)",
 ]
 
 [[package]]
@@ -341,6 +341,7 @@ dependencies = [
 [[package]]
 name = "stm32h7xx-hal"
 version = "0.4.0"
+source = "git+https://github.com/quartiq/stm32h7xx-hal.git?branch=feature/quad-spi#4e67198d881a77aa825b4777e8dc270599a45242"
 dependencies = [
  "bare-metal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -431,6 +432,7 @@ dependencies = [
 "checksum smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum stm32h7 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5b0045066e082648e8a7ab1dd45c92efa8d7bec2beedf72ac7b62563911f82a"
+"checksum stm32h7xx-hal 0.4.0 (git+https://github.com/quartiq/stm32h7xx-hal.git?branch=feature/quad-spi)" = "<none>"
 "checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
 "checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
diff --git a/Cargo.toml b/Cargo.toml
index 209a2b9..8d3bc45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,9 +41,8 @@ embedded-hal = "0.2.3"
 nb = "0.1.2"
 
 [dependencies.stm32h7xx-hal]
-#git = "https://github.com/quartiq/stm32h7xx-hal.git"
-#branch = "feature/quad-spi"
-path = "../stm32h7xx-hal/"
+git = "https://github.com/quartiq/stm32h7xx-hal.git"
+branch = "feature/quad-spi"
 features = ["stm32h743v", "rt"]
 
 [features]
diff --git a/src/main.rs b/src/main.rs
index c9d3098..cc07801 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -356,7 +356,7 @@ const APP: () = {
     }
 
     #[task(binds = SPI2, resources = [adc1, dac1, adc2, dac2, iir_state, iir_ch, dac_pin], priority = 2)]
-    fn adc_spi(c: spi2::Context) {
+    fn adc_spi(c: adc_spi::Context) {
         #[cfg(feature = "bkpt")]
         cortex_m::asm::bkpt();
 
diff --git a/stabilizer.cfg b/stabilizer.cfg
index ea01d24..51d7c6c 100644
--- a/stabilizer.cfg
+++ b/stabilizer.cfg
@@ -1,4 +1,4 @@
-source [find interface/stlink-v2.cfg]
+source [find interface/stlink.cfg]
 transport select hla_swd
 source [find target/stm32h7x_dual_bank.cfg]