From 07b740295308f1d5b7344c469d23db540a3f28df Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Mon, 24 Aug 2020 11:59:10 +0200 Subject: [PATCH 1/2] move to thumbv7em-none-eabihf now that probe-run supports it --- advanced/firmware/.cargo/config | 4 ++-- beginner/apps/.cargo/config | 4 ++-- embedded-workshop-book/src/installation.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/advanced/firmware/.cargo/config b/advanced/firmware/.cargo/config index 7bf7723..52f6fb6 100644 --- a/advanced/firmware/.cargo/config +++ b/advanced/firmware/.cargo/config @@ -1,8 +1,8 @@ -[target.thumbv7em-none-eabi] +[target.thumbv7em-none-eabihf] runner = "probe-run --chip nRF52840_xxAA" rustflags = [ "-C", "link-arg=-Tlink.x", ] [build] -target = "thumbv7em-none-eabi" +target = "thumbv7em-none-eabihf" diff --git a/beginner/apps/.cargo/config b/beginner/apps/.cargo/config index 426f55a..1f11e40 100644 --- a/beginner/apps/.cargo/config +++ b/beginner/apps/.cargo/config @@ -1,8 +1,8 @@ -[target.thumbv7em-none-eabi] +[target.thumbv7em-none-eabihf] runner = "probe-run --chip nRF52840_xxAA" rustflags = [ "-C", "link-arg=-Tlink.x", ] [build] -target = "thumbv7em-none-eabi" # = ARM Cortex-M4 \ No newline at end of file +target = "thumbv7em-none-eabihf" # = ARM Cortex-M4 \ No newline at end of file diff --git a/embedded-workshop-book/src/installation.md b/embedded-workshop-book/src/installation.md index be1d222..3665e16 100644 --- a/embedded-workshop-book/src/installation.md +++ b/embedded-workshop-book/src/installation.md @@ -150,7 +150,7 @@ Installed package `cargo-bloat v0.9.3` (..) $ cargo install probe-run (..) -Installed package `probe-run v0.1.0` (..) +Installed package `probe-run v0.1.3` (..) ``` ## Python From 5109900e4a87963343abff4a02d8987162514f30 Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Mon, 24 Aug 2020 12:04:11 +0200 Subject: [PATCH 2/2] modifyi workflow --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0cdb4b6..5c21856 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -47,7 +47,7 @@ jobs: - name: install all dependencies run: | sudo apt-get install libudev-dev libusb-1.0-0-dev - rustup +stable target add thumbv7em-none-eabi + rustup +stable target add thumbv7em-none-eabihf - name: build tools working-directory: ./tools