Update toolchain to last night's nightly

oxidecomputer · Jul 18, 2022 · 02a2f7e · 02a2f7e
1 parent 7cdd4b8
commit 02a2f7e
Show file tree

Hide file tree

Showing 24 changed files with 96 additions and 86 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/app/demo-stm32f4-discovery/app-f3.toml b/app/demo-stm32f4-discovery/app-f3.toml
@@ -44,7 +44,7 @@ stacksize = 1536
 name = "drv-stm32fx-rcc"
 features = ["f3"]
 priority = 1
-max-sizes = {flash = 4096, ram = 1024}
+max-sizes = {flash = 8192, ram = 1024}
 uses = ["rcc"]
 start = true
 
@@ -96,4 +96,3 @@ priority = 5
 max-sizes = {flash = 128, ram = 256}
 stacksize = 256
 start = true
-
diff --git a/app/demo-stm32f4-discovery/app.toml b/app/demo-stm32f4-discovery/app.toml
@@ -44,7 +44,7 @@ stacksize = 1536
 name = "drv-stm32fx-rcc"
 features = ["f4"]
 priority = 1
-max-sizes = {flash = 4096, ram = 1024}
+max-sizes = {flash = 8192, ram = 1024}
 uses = ["rcc"]
 start = true
 

diff --git a/app/demo-stm32h7-nucleo/app-h753.toml b/app/demo-stm32h7-nucleo/app-h753.toml
@@ -153,7 +153,7 @@ task-slots = ["sys", "hash_driver"]
 name = "drv-stm32h7-hash-server"
 features = ["h753"]
 priority = 3
-max-sizes = {flash = 8192, ram=4096 }
+max-sizes = {flash = 16384, ram=4096 }
 stacksize = 2048
 start = true
 uses = ["hash"]

diff --git a/app/gemini-bu/app.toml b/app/gemini-bu/app.toml
@@ -138,7 +138,7 @@ task-slots = ["sys", "hash_driver"]
 name = "drv-stm32h7-hash-server"
 features = ["h753"]
 priority = 3
-max-sizes = {flash = 8192, ram=4096 }
+max-sizes = {flash = 16384, ram=4096 }
 stacksize = 2048
 start = true
 uses = ["hash"]

diff --git a/app/gimlet/rev-b.toml b/app/gimlet/rev-b.toml
@@ -177,7 +177,7 @@ register_defs = "gimlet-regs-b.json"
 name = "drv-stm32h7-hash-server"
 features = ["h753"]
 priority = 2
-max-sizes = {flash = 8192, ram=4096 }
+max-sizes = {flash = 16384, ram=4096 }
 stacksize = 2048
 start = true
 uses = ["hash"]
@@ -224,7 +224,7 @@ features = ["vlan"]
 [tasks.validate]
 name = "task-validate"
 priority = 5
-max-sizes = {flash = 8192, ram = 4096 }
+max-sizes = {flash = 16384, ram = 4096 }
 stacksize = 1000 
 start = true
 task-slots = ["i2c_driver"]

diff --git a/app/gimletlet/app.toml b/app/gimletlet/app.toml
@@ -111,7 +111,7 @@ features = ["stm32h753", "usart2"]
 uses = ["usart2"]
 interrupts = {"usart2.irq" = 1}
 priority = 3
-max-sizes = {flash = 8192, ram = 4096}
+max-sizes = {flash = 16384, ram = 4096}
 stacksize = 2048
 start = true
 task-slots = ["sys"]
@@ -185,7 +185,7 @@ task-slots = ["sys", "user_leds"]
 [tasks.update_server]
 name = "stm32h7-update-server"
 priority = 3
-max-sizes = {flash = 8192, ram = 4096}
+max-sizes = {flash = 16384, ram = 4096}
 stacksize = 2048
 start = true
 uses = ["flash_controller", "bank2"]

diff --git a/app/sidecar/app.toml b/app/sidecar/app.toml
@@ -244,7 +244,7 @@ task-slots = ["i2c_driver", "sensor", "sequencer"]
 [tasks.validate]
 name = "task-validate"
 priority = 5
-max-sizes = {flash = 8192, ram = 4096 }
+max-sizes = {flash = 16384, ram = 4096 }
 stacksize = 1000
 start = true
 task-slots = ["i2c_driver"]

diff --git a/build/xtask/src/dist.rs b/build/xtask/src/dist.rs
@@ -708,7 +708,6 @@ fn link_task(
     name: &str,
     allocs: &Allocations,
 ) -> Result<()> {
-    println!("linking task '{}'", name);
     let task_toml = &cfg.toml.tasks[name];
     generate_task_linker_script(
         "memory.x",
@@ -1287,6 +1286,7 @@ fn link(
     cmd.arg("-m").arg(m);
     cmd.arg("-z").arg("common-page-size=0x20");
     cmd.arg("-z").arg("max-page-size=0x20");
+    cmd.arg("-rustc-lld-flavor=ld");
 
     cmd.current_dir(working_dir);
 

diff --git a/drv/lpc55-romapi/src/lib.rs b/drv/lpc55-romapi/src/lib.rs
@@ -2,7 +2,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#![feature(asm)]
 #![feature(naked_functions)]
 #![no_std]
 

diff --git a/drv/sidecar-seq-server/src/main.rs b/drv/sidecar-seq-server/src/main.rs
@@ -6,7 +6,6 @@
 
 #![no_std]
 #![no_main]
-#![feature(destructuring_assignment)]
 
 use crate::clock_generator::ClockGenerator;
 use crate::front_io::FrontIOBoard;

diff --git a/drv/stm32g0-usart/Cargo.toml b/drv/stm32g0-usart/Cargo.toml
@@ -10,7 +10,7 @@ num-traits = { version = "0.2.12", default-features = false }
 drv-stm32xx-sys-api = {path = "../stm32xx-sys-api", default-features = false}
 stm32g0 = { git = "https://github.com/oxidecomputer/stm32-rs-nightlies", branch = "stm32g0b1-initial-support", default-features = false }
 cortex-m = { version = "0.7", features = ["inline-asm"] }
-cortex-m-semihosting = { version = "0.3.7", features = ["inline-asm"] }
+cortex-m-semihosting = { version = "0.5.0" }
 
 [features]
 g031 = ["stm32g0/stm32g031", "drv-stm32xx-sys-api/g031"]

diff --git a/drv/stm32xx-sys/src/main.rs b/drv/stm32xx-sys/src/main.rs
@@ -6,6 +6,7 @@
 
 #![no_std]
 #![no_main]
+#![deny(unsafe_op_in_unsafe_fn)]
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "family-stm32g0")] {

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2021-09-22"
+channel = "nightly-2022-07-17"
 targets = [ "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf" ]
 profile = "minimal"
 components = [ "rustfmt" ]
diff --git a/stage0/src/main.rs b/stage0/src/main.rs
@@ -3,12 +3,13 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #![feature(cmse_nonsecure_entry)]
-#![feature(asm)]
 #![feature(naked_functions)]
 #![feature(array_methods)]
 #![no_main]
 #![no_std]
 
+use core::arch;
+
 extern crate lpc55_pac;
 extern crate panic_halt;
 use cortex_m::peripheral::Peripherals;
@@ -98,7 +99,7 @@ unsafe fn branch_to_image(image: Image) -> ! {
     let stack = image.get_sp();
 
     // and branch
-    asm!("
+    arch::asm!("
             msr MSP_NS, {stack}
             bxns {entry}",
         stack = in(reg) stack,
@@ -125,7 +126,7 @@ unsafe fn branch_to_image(image: Image) -> ! {
     let stack = image.get_sp();
 
     // and branch
-    asm!("
+    arch::asm!("
             msr MSP, {stack}
             bx {entry}",
         stack = in(reg) stack,