diff --git a/.cargo/config b/.cargo/config
index b84a4d2..d5176c3 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,5 +1,5 @@
-[target.thumbv6m-none-eabi]
-runner = 'arm-none-eabi-gdb'
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+# runner = 'arm-none-eabi-gdb -x debug.gdb'
 rustflags = [
   # LLD (shipped with the Rust toolchain) is used as the default linker
   "-C", "link-arg=-Tlink.x",
@@ -16,41 +16,23 @@ rustflags = [
   # "-C", "link-arg=-nostartfiles",
 ]
 
+# work around rust-lang/cargo#5946
+[target.thumbv6m-none-eabi]
+runner = 'arm-none-eabi-gdb -x debug.gdb'
+
 [target.thumbv7m-none-eabi]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  # the comments under `[target.thumbv6m-none-eabi]` also apply here
-  "-C", "link-arg=-Tlink.x",
-
-  # "-C", "linker=arm-none-eabi-ld",
-
-  # "-C", "linker=arm-none-eabi-gcc",
-  # "-C", "link-arg=-Wl,-Tlink.x",
-  # "-C", "link-arg=-nostartfiles",
-]
+runner = 'arm-none-eabi-gdb -x debug.gdb'
 
 [target.thumbv7em-none-eabi]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  # the comments under `[target.thumbv6m-none-eabi]` also apply here
-  "-C", "link-arg=-Tlink.x",
-
-  # "-C", "linker=arm-none-eabi-ld",
-
-  # "-C", "linker=arm-none-eabi-gcc",
-  # "-C", "link-arg=-Wl,-Tlink.x",
-  # "-C", "link-arg=-nostartfiles",
-]
+runner = 'arm-none-eabi-gdb -x debug.gdb'
 
 [target.thumbv7em-none-eabihf]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  # the comments under `[target.thumbv6m-none-eabi]` also apply here
-  "-C", "link-arg=-Tlink.x",
+runner = 'arm-none-eabi-gdb -x debug.gdb'
+# end of workaround
 
-  # "-C", "linker=arm-none-eabi-ld",
-
-  # "-C", "linker=arm-none-eabi-gcc",
-  # "-C", "link-arg=-Wl,-Tlink.x",
-  # "-C", "link-arg=-nostartfiles",
-]
+[build]
+# Pick one of these compilation targets
+# target = "thumbv6m-none-eabi"    # Cortex-M0 and Cortex-M0+
+# target = "thumbv7m-none-eabi"    # Cortex-M3
+# target = "thumbv7em-none-eabi"   # Cortex-M4 and Cortex-M7 (no FPU)
+# target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
\ No newline at end of file
diff --git a/.gdbinit b/debug.gdb
similarity index 100%
rename from .gdbinit
rename to debug.gdb