diff options
| author | Tyler <[email protected]> | 2023-07-01 15:41:11 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-01 15:41:11 -0500 |
| commit | 3aedbce5c2775ff1ab10c3ca95ea1311043f4be4 (patch) | |
| tree | 3cbd9c15c68c7ee3859a17ec6d6fc7150e569686 /examples/boot/bootloader | |
| parent | 1f2be2dac5eeed739d2866b9b63ca06fdd84c276 (diff) | |
| parent | ba4344429264fa7beb99ab19c09059c2d531716d (diff) | |
Merge pull request #1 from embassy-rs/main
Pull changes from embassy main
Diffstat (limited to 'examples/boot/bootloader')
| -rw-r--r-- | examples/boot/bootloader/nrf/.cargo/config.toml | 2 | ||||
| -rw-r--r-- | examples/boot/bootloader/rp/.cargo/config.toml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/boot/bootloader/nrf/.cargo/config.toml b/examples/boot/bootloader/nrf/.cargo/config.toml index d636b1d23..c292846aa 100644 --- a/examples/boot/bootloader/nrf/.cargo/config.toml +++ b/examples/boot/bootloader/nrf/.cargo/config.toml | |||
| @@ -4,7 +4,7 @@ build-std-features = ["panic_immediate_abort"] | |||
| 4 | 4 | ||
| 5 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] | 5 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] |
| 6 | #runner = "./fruitrunner" | 6 | #runner = "./fruitrunner" |
| 7 | runner = "probe-rs-cli run --chip nrf52840_xxAA" | 7 | runner = "probe-rs run --chip nrf52840_xxAA" |
| 8 | 8 | ||
| 9 | rustflags = [ | 9 | rustflags = [ |
| 10 | # Code-size optimizations. | 10 | # Code-size optimizations. |
diff --git a/examples/boot/bootloader/rp/.cargo/config.toml b/examples/boot/bootloader/rp/.cargo/config.toml index 795ee043a..9d48ecdc9 100644 --- a/examples/boot/bootloader/rp/.cargo/config.toml +++ b/examples/boot/bootloader/rp/.cargo/config.toml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] | 1 | [target.'cfg(all(target_arch = "arm", target_os = "none"))'] |
| 2 | runner = "probe-rs-cli run --chip RP2040" | 2 | runner = "probe-rs run --chip RP2040" |
| 3 | 3 | ||
| 4 | [build] | 4 | [build] |
| 5 | target = "thumbv6m-none-eabi" | 5 | target = "thumbv6m-none-eabi" |