From a0f8948c1c49cc18cd70169e00c357dec202107a Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Tue, 16 Jul 2024 16:40:29 +0200
Subject: [PATCH] Update nightly, fix error with rp inline asm.
---
embassy-rp/src/bootsel.rs | 4 ++--
embassy-rp/src/flash.rs | 12 ++++++------
rust-toolchain-nightly.toml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/embassy-rp/src/bootsel.rs b/embassy-rp/src/bootsel.rs
index 540255ae3..d24ce7bd8 100644
--- a/embassy-rp/src/bootsel.rs
+++ b/embassy-rp/src/bootsel.rs
@@ -57,9 +57,9 @@ mod ram_helpers {
"str {val}, [{cs_gpio}, $GPIO_CTRL]",
// ...then wait for the state to settle...
- "1:", // ~4000 cycle delay loop
+ "2:", // ~4000 cycle delay loop
"subs {val}, #8",
- "bne 1b",
+ "bne 2b",
// ...we can read the current state of bootsel
"ldr {val}, [{cs_gpio}, $GPIO_STATUS]",
diff --git a/embassy-rp/src/flash.rs b/embassy-rp/src/flash.rs
index 6e2a823d8..9e4542b2f 100644
--- a/embassy-rp/src/flash.rs
+++ b/embassy-rp/src/flash.rs
@@ -625,18 +625,18 @@ mod ram_helpers {
"movs r3, #0", // r3 = 0
"ldr r4, [{ptrs}, #8]",
"cmp r4, #0",
- "beq 1f",
+ "beq 2f",
"blx r4", // flash_range_erase(addr, len, 1 << 31, 0)
- "1:",
+ "2:",
"mov r0, r8", // r0 = addr
"mov r1, r9", // r0 = data
"mov r2, r10", // r2 = len
"ldr r4, [{ptrs}, #12]",
"cmp r4, #0",
- "beq 1f",
+ "beq 2f",
"blx r4", // flash_range_program(addr, data, len);
- "1:",
+ "2:",
"ldr r4, [{ptrs}, #16]",
"blx r4", // flash_flush_cache();
@@ -802,12 +802,12 @@ mod ram_helpers {
"adds r2, 0x60", // &DR
"ldr r0, [r3, #0]", // cmd_addr
"ldr r1, [r3, #4]", // cmd_addr_len
- "10:",
+ "3:",
"ldrb r3, [r0]",
"strb r3, [r2]", // DR
"adds r0, #1",
"subs r1, #1",
- "bne 10b",
+ "bne 3b",
// Skip any dummy cycles
"mov r3, r10", // cmd
diff --git a/rust-toolchain-nightly.toml b/rust-toolchain-nightly.toml
index d965d67dd..dfa231344 100644
--- a/rust-toolchain-nightly.toml
+++ b/rust-toolchain-nightly.toml
@@ -1,5 +1,5 @@
[toolchain]
-channel = "nightly-2024-06-18"
+channel = "nightly-2024-07-16"
components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ]
targets = [
"thumbv7em-none-eabi",