Merge pull request #28 from tock/update-aug-2023-wm1110

Aug 2023: update to recent Tock, and add wm1110 dev board

Author: bradjc

.gitignore

@@ -1,4 +1,5 @@
 build
 target
 local_cargo
+Cargo.lock
 

arch/bootloader_cortexm/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Tock Project Developers <[email protected]>"]
 
 [dependencies]
-kernel = { git = "https://github.com/tock/tock", rev = "405417" }
+kernel = { git = "https://github.com/tock/tock", rev = "2ff6868" }
 #kernel = { path = "../../../tock/kernel" }
 
 bootloader = { path = "../../bootloader" }

arch/bootloader_cortexm/src/jumper.rs

@@ -8,17 +8,18 @@ impl CortexMJumper {
 
 impl bootloader::interfaces::Jumper for CortexMJumper {
     fn jump(&self, address: u32) -> ! {
+        use core::arch::asm;
         unsafe {
             asm!(
             ".syntax unified                                                                                   \n\
-            mov r0, {0}         // The address of the payload's .vectors                                       \n\
+            mov r0, {address}   // The address of the payload's .vectors                                       \n\
             ldr r1, =0xe000ed08 // The address of the VTOR register (0xE000E000(SCS) + 0xD00(SCB) + 0x8(VTOR)) \n\
             str r0, [r1]        // Move the payload's VT address into the VTOR register                        \n\
             ldr r1, [r0]        // Move the payload's initial SP into r1                                       \n\
             mov sp, r1          // Set our SP to that                                                          \n\
             ldr r0, [r0, #4]    // Load the payload's ENTRY into r0                                            \n\
             bx  r0              // Whoopee",
-            in(reg) address,
+            address = in(reg) address,
             );
         }
         loop {}

arch/bootloader_cortexm/src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(const_fn, asm)]
 #![no_std]
 
 pub mod jumper;

boards/Common.mk

@@ -3,16 +3,17 @@ name = "clue_nrf52840-bootloader"
 version = "0.1.0"
 authors = ["Tock Project Developers <[email protected]>"]
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-cortexm4 = { git = "https://github.com/tock/tock", rev = "405417" }
-capsules = { git = "https://github.com/tock/tock", rev = "405417" }
-kernel = { git = "https://github.com/tock/tock", rev = "405417" }
-nrf52 = { git = "https://github.com/tock/tock", rev = "405417" }
-nrf52840 = { git = "https://github.com/tock/tock", rev = "405417" }
-components = { git = "https://github.com/tock/tock", rev = "405417" }
-nrf52_components = { git = "https://github.com/tock/tock", rev = "405417" }
+cortexm4 = { git = "https://github.com/tock/tock", rev = "2ff6868" }
+capsules-core = { git = "https://github.com/tock/tock", rev = "2ff6868" }
+capsules-extra = { git = "https://github.com/tock/tock", rev = "2ff6868" }
+kernel = { git = "https://github.com/tock/tock", rev = "2ff6868" }
+nrf52 = { git = "https://github.com/tock/tock", rev = "2ff6868" }
+nrf52840 = { git = "https://github.com/tock/tock", rev = "2ff6868" }
+components = { git = "https://github.com/tock/tock", rev = "2ff6868" }
+nrf52_components = { git = "https://github.com/tock/tock", rev = "2ff6868" }
 
 # For Development
 # cortexm4 = { path = "../../../tock/arch/cortex-m4" }

boards/clue_nrf52840-bootloader/Cargo.lock

@@ -5,7 +5,7 @@ fn main() {
     println!("cargo:rerun-if-changed=../kernel_layout.ld");
 
     let mut f = bootloader_attributes::get_file();
-    bootloader_attributes::write_flags(&mut f, "1.1.0", 0x36000);
+    bootloader_attributes::write_flags(&mut f, "1.1.3", 0x36000);
     bootloader_attributes::write_attribute(&mut f, "board", "clue_nrf52840");
     bootloader_attributes::write_attribute(&mut f, "arch", "cortex-m4");
     bootloader_attributes::write_attribute(&mut f, "appaddr", "0x80000");