Skip to content

Commit 9ab7b11

Browse files
committed
Update toolchain to last night's nightly
1 parent b12ae65 commit 9ab7b11

File tree

25 files changed

+102
-92
lines changed

25 files changed

+102
-92
lines changed

Cargo.lock

Lines changed: 16 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/demo-stm32f4-discovery/app-f3.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stacksize = 1536
4444
name = "drv-stm32fx-rcc"
4545
features = ["f3"]
4646
priority = 1
47-
max-sizes = {flash = 4096, ram = 1024}
47+
max-sizes = {flash = 8192, ram = 1024}
4848
uses = ["rcc"]
4949
start = true
5050

@@ -96,4 +96,3 @@ priority = 5
9696
max-sizes = {flash = 128, ram = 256}
9797
stacksize = 256
9898
start = true
99-

app/demo-stm32f4-discovery/app.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stacksize = 1536
4444
name = "drv-stm32fx-rcc"
4545
features = ["f4"]
4646
priority = 1
47-
max-sizes = {flash = 4096, ram = 1024}
47+
max-sizes = {flash = 8192, ram = 1024}
4848
uses = ["rcc"]
4949
start = true
5050

app/demo-stm32h7-nucleo/app-h753.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ task-slots = ["sys", "hash_driver"]
153153
name = "drv-stm32h7-hash-server"
154154
features = ["h753"]
155155
priority = 3
156-
max-sizes = {flash = 8192, ram=4096 }
156+
max-sizes = {flash = 16384, ram=4096 }
157157
stacksize = 2048
158158
start = true
159159
uses = ["hash"]

app/gemini-bu/app.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ task-slots = ["sys", "hash_driver"]
138138
name = "drv-stm32h7-hash-server"
139139
features = ["h753"]
140140
priority = 3
141-
max-sizes = {flash = 8192, ram=4096 }
141+
max-sizes = {flash = 16384, ram=4096 }
142142
stacksize = 2048
143143
start = true
144144
uses = ["hash"]

app/gimlet/rev-b.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ register_defs = "gimlet-regs-b.json"
177177
name = "drv-stm32h7-hash-server"
178178
features = ["h753"]
179179
priority = 2
180-
max-sizes = {flash = 8192, ram=4096 }
180+
max-sizes = {flash = 16384, ram=4096 }
181181
stacksize = 2048
182182
start = true
183183
uses = ["hash"]
@@ -224,7 +224,7 @@ features = ["vlan"]
224224
[tasks.validate]
225225
name = "task-validate"
226226
priority = 5
227-
max-sizes = {flash = 8192, ram = 4096 }
227+
max-sizes = {flash = 16384, ram = 4096 }
228228
stacksize = 1000
229229
start = true
230230
task-slots = ["i2c_driver"]

app/gimletlet/app.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ features = ["stm32h753", "usart2"]
111111
uses = ["usart2"]
112112
interrupts = {"usart2.irq" = 0b01}
113113
priority = 3
114-
max-sizes = {flash = 8192, ram = 4096}
114+
max-sizes = {flash = 16384, ram = 4096}
115115
stacksize = 2048
116116
start = true
117117
task-slots = ["sys"]
@@ -199,7 +199,7 @@ task-slots = ["sys", "user_leds"]
199199
[tasks.update_server]
200200
name = "stm32h7-update-server"
201201
priority = 3
202-
max-sizes = {flash = 8192, ram = 4096}
202+
max-sizes = {flash = 16384, ram = 4096}
203203
stacksize = 2048
204204
start = true
205205
uses = ["flash_controller", "bank2"]

app/sidecar/app.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ task-slots = ["i2c_driver", "sensor", "sequencer"]
244244
[tasks.validate]
245245
name = "task-validate"
246246
priority = 5
247-
max-sizes = {flash = 8192, ram = 4096 }
247+
max-sizes = {flash = 16384, ram = 4096 }
248248
stacksize = 1000
249249
start = true
250250
task-slots = ["i2c_driver"]

build/xtask/src/config.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -551,15 +551,14 @@ impl BuildConfig<'_> {
551551
None => PathBuf::from("cargo"),
552552
});
553553

554-
// nightly features that we use: asm_sym,named-profiles,naked_functions
555-
// cmse_nonsecure_entry,array_methods,destructuring_assignment
556-
// nightly features that our dependencies use: proc_macro_span,backtrace
557-
// asm,llvm_asm
554+
// nightly features that we use: asm_sym,asm_const,
555+
// named-profiles,naked_functions,cmse_nonsecure_entry,array_methods
556+
//
557+
// nightly features that our dependencies use: backtrace,proc_macro_span
558558

559559
cmd.arg(
560-
"-Zallow-features=asm,asm_sym,named-profiles,naked_functions,\
561-
cmse_nonsecure_entry,array_methods,destructuring_assignment,proc_macro_span,\
562-
backtrace,llvm_asm",
560+
"-Zallow-features=asm_sym,asm_const,named-profiles,naked_functions,\
561+
cmse_nonsecure_entry,array_methods,backtrace,proc_macro_span",
563562
);
564563

565564
cmd.arg(subcommand);

build/xtask/src/dist.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,7 @@ fn link(
12871287
cmd.arg("-m").arg(m);
12881288
cmd.arg("-z").arg("common-page-size=0x20");
12891289
cmd.arg("-z").arg("max-page-size=0x20");
1290+
cmd.arg("-rustc-lld-flavor=ld");
12901291

12911292
cmd.current_dir(working_dir);
12921293

drv/lpc55-romapi/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// License, v. 2.0. If a copy of the MPL was not distributed with this
33
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
44

5-
#![feature(asm)]
65
#![feature(naked_functions)]
76
#![no_std]
87

drv/sidecar-seq-server/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
77
#![no_std]
88
#![no_main]
9-
#![feature(destructuring_assignment)]
109

1110
use crate::clock_generator::ClockGenerator;
1211
use crate::front_io::FrontIOBoard;

drv/stm32g0-usart/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ num-traits = { version = "0.2.12", default-features = false }
1010
drv-stm32xx-sys-api = {path = "../stm32xx-sys-api", default-features = false}
1111
stm32g0 = { git = "https://github.com/oxidecomputer/stm32-rs-nightlies", branch = "stm32g0b1-initial-support", default-features = false }
1212
cortex-m = { version = "0.7", features = ["inline-asm"] }
13-
cortex-m-semihosting = { version = "0.3.7", features = ["inline-asm"] }
13+
cortex-m-semihosting = { version = "0.5.0" }
1414

1515
[features]
1616
g031 = ["stm32g0/stm32g031", "drv-stm32xx-sys-api/g031"]

drv/stm32xx-sys/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
77
#![no_std]
88
#![no_main]
9+
#![deny(unsafe_op_in_unsafe_fn)]
910

1011
cfg_if::cfg_if! {
1112
if #[cfg(feature = "family-stm32g0")] {

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2021-09-22"
2+
channel = "nightly-2022-07-27"
33
targets = [ "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf" ]
44
profile = "minimal"
55
components = [ "rustfmt" ]

stage0/src/main.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
44

55
#![feature(cmse_nonsecure_entry)]
6-
#![feature(asm)]
76
#![feature(naked_functions)]
87
#![feature(array_methods)]
98
#![no_main]
109
#![no_std]
1110

11+
use core::arch;
12+
1213
extern crate lpc55_pac;
1314
extern crate panic_halt;
1415
use cortex_m::peripheral::Peripherals;
@@ -98,7 +99,7 @@ unsafe fn branch_to_image(image: Image) -> ! {
9899
let stack = image.get_sp();
99100

100101
// and branch
101-
asm!("
102+
arch::asm!("
102103
msr MSP_NS, {stack}
103104
bxns {entry}",
104105
stack = in(reg) stack,
@@ -125,7 +126,7 @@ unsafe fn branch_to_image(image: Image) -> ! {
125126
let stack = image.get_sp();
126127

127128
// and branch
128-
asm!("
129+
arch::asm!("
129130
msr MSP, {stack}
130131
bx {entry}",
131132
stack = in(reg) stack,

0 commit comments

Comments
 (0)