From 172dbc17cdb658bbcb416cfb4c1aa19c18f3e190 Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Wed, 16 Sep 2020 17:30:09 -0700 Subject: [PATCH] Update cross compilation target Use the target actually mentioned in the .cargo/config file. Updated the output in the troubleshooting page and also updated the target for the board/dongle. --- boards/dongle/.cargo/config | 4 ++-- embedded-workshop-book/src/installation.md | 2 +- embedded-workshop-book/src/troubleshoot-cargo-run-error.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boards/dongle/.cargo/config b/boards/dongle/.cargo/config index f0d8ff9..1a5f988 100644 --- a/boards/dongle/.cargo/config +++ b/boards/dongle/.cargo/config @@ -1,8 +1,8 @@ -[target.thumbv7em-none-eabi] +[target.thumbv7em-none-eabihf] runner = "dongle-flash" rustflags = [ "-C", "link-arg=-Tlink.x", ] [build] -target = "thumbv7em-none-eabi" \ No newline at end of file +target = "thumbv7em-none-eabihf" \ No newline at end of file diff --git a/embedded-workshop-book/src/installation.md b/embedded-workshop-book/src/installation.md index 3665e16..e8d0771 100644 --- a/embedded-workshop-book/src/installation.md +++ b/embedded-workshop-book/src/installation.md @@ -114,7 +114,7 @@ Go to [https://rustup.rs](https://rustup.rs/) and follow the instructions. **All**: Run this command in a terminal: ``` console -$ rustup +stable target add thumbv7em-none-eabi +$ rustup +stable target add thumbv7em-none-eabihf ``` ### ELF analysis tools diff --git a/embedded-workshop-book/src/troubleshoot-cargo-run-error.md b/embedded-workshop-book/src/troubleshoot-cargo-run-error.md index 43f8417..76219f2 100644 --- a/embedded-workshop-book/src/troubleshoot-cargo-run-error.md +++ b/embedded-workshop-book/src/troubleshoot-cargo-run-error.md @@ -7,7 +7,7 @@ You may get one of these errors: ``` console $ cargo run --bin usb-4 -Running `probe-run target/thumbv7em-none-eabi/debug/usb-4` +Running `probe-run target/thumbv7em-none-eabihf/debug/usb-4` Error: An error specific to a probe type occured: USB error while taking control over USB device: Access denied (insufficient permissions) Caused by: @@ -16,7 +16,7 @@ Caused by: ``` console $ cargo run --bin usb-4 -Running `probe-run target/thumbv7em-none-eabi/debug/usb-4` +Running `probe-run target/thumbv7em-none-eabihf/debug/usb-4` Error: An error specific to a probe type occured: USB error while taking control over USB device: Resource busy Caused by: