cleaned up linking again

BartMassey · BartMassey · commit 9025968d16f4 · 2024-07-25T14:04:41.000-07:00
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -4,5 +4,6 @@ target = "thumbv7em-none-eabihf"
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
+  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [
   "mdbook/src/03-setup",
   "mdbook/src/05-hello-world",
   "mdbook/src/05-led-roulette",
-  "mdbook/src/07-registers",
+# "mdbook/src/07-registers",
   "mdbook/src/09-uart",
   "mdbook/src/10-i2c",
   "mdbook/src/11-led-compass",
diff --git a/mdbook/src/03-setup/.cargo/config.toml b/mdbook/src/03-setup/.cargo/config.toml
@@ -4,5 +4,5 @@ target = "thumbv7em-none-eabihf"
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
-  "-C", "link-arg=-Tlink.x",
+  "-C", "linker=rust-lld",
 ]
diff --git a/mdbook/src/03-setup/Cargo.toml b/mdbook/src/03-setup/Cargo.toml
@@ -9,6 +9,10 @@ cortex-m-rt = "0.7.3"
 panic-rtt-target = "0.1.3"
 rtt-target = "0.5.0"
 
+[dependencies.nrf52833-pac]
+version = "0.12.2"
+features = ["cortex-m-rt"]
+
 [dependencies.cortex-m]
 version = "0.7.7"
 features = ["inline-asm", "critical-section-single-core"]
diff --git a/mdbook/src/03-setup/src/main.rs b/mdbook/src/03-setup/src/main.rs
@@ -3,6 +3,7 @@
 
 use cortex_m::asm::wfi;
 use panic_rtt_target as _;
+use nrf52833_pac as _;
 use rtt_target::{rprintln, rtt_init_print};
 
 use cortex_m_rt::entry;
diff --git a/mdbook/src/05-hello-world/.cargo/config.toml b/mdbook/src/05-hello-world/.cargo/config.toml
@@ -3,3 +3,6 @@ target = "thumbv7em-none-eabihf"
 
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
+rustflags = [
+  "-C", "linker=rust-lld",
+]
diff --git a/mdbook/src/05-led-roulette/.cargo/config.toml b/mdbook/src/05-led-roulette/.cargo/config.toml
@@ -5,5 +5,4 @@ target = "thumbv7em-none-eabihf"
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
   "-C", "linker=rust-lld",
-  "-C", "link-arg=-Tlink.x",
 ]
diff --git a/mdbook/src/07-registers/.cargo/config.toml b/mdbook/src/07-registers/.cargo/config.toml
@@ -1,9 +1,8 @@
-[target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = "rust-gdb -x embed.gdb"
+[build]
+target = "thumbv7em-none-eabihf"
 
+[target.thumbv7em-none-eabihf]
+runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
-  "-C", "link-arg=-Tlink.x",
+  "-C", "linker=rust-lld",
 ]
-
-[build]
-target = "thumbv7em-none-eabihf"
diff --git a/mdbook/src/07-registers/memory.x b/mdbook/src/07-registers/memory.x
diff --git a/mdbook/src/09-uart/.cargo/config.toml b/mdbook/src/09-uart/.cargo/config.toml
@@ -5,5 +5,4 @@ target = "thumbv7em-none-eabihf"
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
   "-C", "linker=rust-lld",
-  "-C", "link-arg=-Tlink.x",
 ]
diff --git a/mdbook/src/10-i2c/.cargo/config.toml b/mdbook/src/10-i2c/.cargo/config.toml
@@ -4,5 +4,5 @@ target = "thumbv7em-none-eabihf"
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
-  "-C", "link-arg=-Tlink.x",
+  "-C", "linker=rust-lld",
 ]
diff --git a/mdbook/src/11-led-compass/.cargo/config.toml b/mdbook/src/11-led-compass/.cargo/config.toml
@@ -4,5 +4,5 @@ target = "thumbv7em-none-eabihf"
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
-  "-C", "link-arg=-Tlink.x",
+  "-C", "linker=rust-lld",
 ]
diff --git a/mdbook/src/12-punch-o-meter/.cargo/config.toml b/mdbook/src/12-punch-o-meter/.cargo/config.toml
@@ -4,5 +4,5 @@ target = "thumbv7em-none-eabihf"
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
-  "-C", "link-arg=-Tlink.x",
+  "-C", "linker=rust-lld",
 ]
diff --git a/mdbook/src/13-snake-game/.cargo/config.toml b/mdbook/src/13-snake-game/.cargo/config.toml
@@ -4,5 +4,5 @@ target = "thumbv7em-none-eabihf"
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
-  "-C", "link-arg=-Tlink.x",
+  "-C", "linker=rust-lld",
 ]
diff --git a/mdbook/src/appendix/3-mag-calibration/.cargo/config.toml b/mdbook/src/appendix/3-mag-calibration/.cargo/config.toml
@@ -4,5 +4,5 @@ target = "thumbv7em-none-eabihf"
 [target.thumbv7em-none-eabihf]
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
-  "-C", "link-arg=-Tlink.x",
+  "-C", "linker=rust-lld",
 ]
diff --git a/mdbook/src/serial-setup/.cargo/config.toml b/mdbook/src/serial-setup/.cargo/config.toml
@@ -5,5 +5,4 @@ target = "thumbv7em-none-eabihf"
 runner = "probe-rs run --chip nRF52833_xxAA"
 rustflags = [
   "-C", "linker=rust-lld",
-  "-C", "link-arg=-Tlink.x",
 ]

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ target = "thumbv7em-none-eabihf"`
`4`	`4`	`[target.thumbv7em-none-eabihf]`
`5`	`5`	`runner = "probe-rs run --chip nRF52833_xxAA"`
`6`	`6`	`rustflags = [`
	`7`	`+ "-C", "linker=rust-lld",`
`7`	`8`	`"-C", "link-arg=-Tlink.x",`
`8`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ target = "thumbv7em-none-eabihf"`
`4`	`4`	`[target.thumbv7em-none-eabihf]`
`5`	`5`	`runner = "probe-rs run --chip nRF52833_xxAA"`
`6`	`6`	`rustflags = [`
`7`		`- "-C", "link-arg=-Tlink.x",`
	`7`	`+ "-C", "linker=rust-lld",`
`8`	`8`	`]`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,4 @@ target = "thumbv7em-none-eabihf"`
`5`	`5`	`runner = "probe-rs run --chip nRF52833_xxAA"`
`6`	`6`	`rustflags = [`
`7`	`7`	`"-C", "linker=rust-lld",`
`8`		`- "-C", "link-arg=-Tlink.x",`
`9`	`8`	`]`