nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-28 17:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3182 from embassy-rs/nightly-update-more

Browse Source 
Update nightly, fix error with rp inline asm.
This commit is contained in:
Dario Nieuwenhuis 2024-07-16 14:48:00 +00:00 committed by GitHub
commit e54c753537
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-rp/src/bootsel.rs
View File

@ -57,9 +57,9 @@ mod ram_helpers {
"str {val}, [{cs_gpio}, $GPIO_CTRL]", "str {val}, [{cs_gpio}, $GPIO_CTRL]",
// ...then wait for the state to settle... // ...then wait for the state to settle...
"1:", // ~4000 cycle delay loop "2:", // ~4000 cycle delay loop
"subs {val}, #8", "subs {val}, #8",
"bne 1b", "bne 2b",
// ...we can read the current state of bootsel // ...we can read the current state of bootsel
"ldr {val}, [{cs_gpio}, $GPIO_STATUS]", "ldr {val}, [{cs_gpio}, $GPIO_STATUS]",

12
embassy-rp/src/flash.rs
View File

@ -625,18 +625,18 @@ mod ram_helpers {
"movs r3, #0", // r3 = 0 "movs r3, #0", // r3 = 0
"ldr r4, [{ptrs}, #8]", "ldr r4, [{ptrs}, #8]",
"cmp r4, #0", "cmp r4, #0",
"beq 1f", "beq 2f",
"blx r4", // flash_range_erase(addr, len, 1 << 31, 0) "blx r4", // flash_range_erase(addr, len, 1 << 31, 0)
"1:", "2:",
"mov r0, r8", // r0 = addr "mov r0, r8", // r0 = addr
"mov r1, r9", // r0 = data "mov r1, r9", // r0 = data
"mov r2, r10", // r2 = len "mov r2, r10", // r2 = len
"ldr r4, [{ptrs}, #12]", "ldr r4, [{ptrs}, #12]",
"cmp r4, #0", "cmp r4, #0",
"beq 1f", "beq 2f",
"blx r4", // flash_range_program(addr, data, len); "blx r4", // flash_range_program(addr, data, len);
"1:", "2:",
"ldr r4, [{ptrs}, #16]", "ldr r4, [{ptrs}, #16]",
"blx r4", // flash_flush_cache(); "blx r4", // flash_flush_cache();
@ -802,12 +802,12 @@ mod ram_helpers {
"adds r2, 0x60", // &DR "adds r2, 0x60", // &DR
"ldr r0, [r3, #0]", // cmd_addr "ldr r0, [r3, #0]", // cmd_addr
"ldr r1, [r3, #4]", // cmd_addr_len "ldr r1, [r3, #4]", // cmd_addr_len
"10:", "3:",
"ldrb r3, [r0]", "ldrb r3, [r0]",
"strb r3, [r2]", // DR "strb r3, [r2]", // DR
"adds r0, #1", "adds r0, #1",
"subs r1, #1", "subs r1, #1",
"bne 10b", "bne 3b",
// Skip any dummy cycles // Skip any dummy cycles
"mov r3, r10", // cmd "mov r3, r10", // cmd

2
rust-toolchain-nightly.toml
View File

@ -1,5 +1,5 @@
[toolchain] [toolchain]
channel = "nightly-2024-06-18" channel = "nightly-2024-07-16"
components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ] components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ]
targets = [ targets = [
"thumbv7em-none-eabi", "thumbv7em-none-eabi",