Merge pull request 'Update Rust crate embassy-time to 0.4.0' (#5) from renovate/embassy-time-0.x into main
Some checks failed
Check Build / Test build (push) Has been cancelled
Some checks failed
Check Build / Test build (push) Has been cancelled
Reviewed-on: #5
This commit is contained in:
commit
3abf6362be
4 changed files with 10 additions and 20 deletions
|
@ -1,6 +1,6 @@
|
||||||
[build]
|
[build]
|
||||||
# Set the default target to match the Cortex-M0+ in the RP2040
|
# Set the default target to match the Cortex-M0+ in the RP2040
|
||||||
target = "thumbv6m-none-eabi"
|
target = "thumbv8m.main-none-eabihf"
|
||||||
|
|
||||||
[target.thumbv6m-none-eabi]
|
[target.thumbv6m-none-eabi]
|
||||||
rustflags = [
|
rustflags = [
|
||||||
|
@ -10,5 +10,5 @@ rustflags = [
|
||||||
"-C", "no-vectorize-loops",
|
"-C", "no-vectorize-loops",
|
||||||
]
|
]
|
||||||
|
|
||||||
runner = "elf2uf2-rs -d"
|
runner = "picotool load -u -v -x -t elf"
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,9 @@ categories = ["embedded", "hardware-support", "no-std"]
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
embassy-rp = { version = "0.2.0", features = ["unstable-pac", "time-driver", "critical-section-impl"] }
|
embassy-rp = { version = "0.3.0", features = ["unstable-pac", "time-driver", "critical-section-impl"] }
|
||||||
embassy-time = { version = "0.3.0" }
|
embassy-time = { version = "0.4.0" }
|
||||||
|
cortex-m = { version = "0.7.6", features = ["inline-asm"] }
|
||||||
cortex-m-rt = "0.7.3"
|
cortex-m-rt = "0.7.3"
|
||||||
|
|
||||||
pio-proc = "0.2.2"
|
pio-proc = "0.2.2"
|
||||||
|
@ -26,3 +27,7 @@ fixed-macro = "1.2"
|
||||||
|
|
||||||
serde = { version = "1.0.203", default-features = false, features = ["derive"] }
|
serde = { version = "1.0.203", default-features = false, features = ["derive"] }
|
||||||
|
|
||||||
|
[features]
|
||||||
|
rp235xa = ["embassy-rp/rp235xa"]
|
||||||
|
rp235xb = ["embassy-rp/rp235xb"]
|
||||||
|
|
||||||
|
|
15
memory.x
15
memory.x
|
@ -1,15 +0,0 @@
|
||||||
MEMORY {
|
|
||||||
BOOT2 : ORIGIN = 0x10000000, LENGTH = 0x100
|
|
||||||
FLASH : ORIGIN = 0x10000100, LENGTH = 2048K - 0x100
|
|
||||||
RAM : ORIGIN = 0x20000000, LENGTH = 256K
|
|
||||||
}
|
|
||||||
|
|
||||||
EXTERN(BOOT2_FIRMWARE)
|
|
||||||
|
|
||||||
SECTIONS {
|
|
||||||
/* ### Boot loader */
|
|
||||||
.boot2 ORIGIN(BOOT2) :
|
|
||||||
{
|
|
||||||
KEEP(*(.boot2));
|
|
||||||
} > BOOT2
|
|
||||||
} INSERT BEFORE .text;
|
|
|
@ -1,3 +1,3 @@
|
||||||
[toolchain]
|
[toolchain]
|
||||||
components = [ "rust-src", "rustfmt", "llvm-tools" ]
|
components = [ "rust-src", "rustfmt", "llvm-tools" ]
|
||||||
targets = ["thumbv6m-none-eabi"]
|
targets = ["thumbv6m-none-eabi", "thumbv8m.main-none-eabihf"]
|
Loading…
Reference in a new issue