Merge remote-tracking branch 'odp/main' into james/impl-clocks

10 files changed, 25 insertions, 104 deletions

diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 000000000..55dd5ea5f
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[build]
+target = "thumbv8m.main-none-eabihf" # Cortex-M33
diff --git a/Cargo.lock b/Cargo.lock
index e9f4d3165..0fb5bfb12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,41 +81,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
-name = "darling"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
 name = "defmt"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -174,37 +139,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "embassy-executor"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b"
-dependencies = [
- "cortex-m",
- "critical-section",
- "document-features",
- "embassy-executor-macros",
- "embassy-executor-timer-queue",
-]
-
-[[package]]
-name = "embassy-executor-macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "embassy-executor-timer-queue"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c"
-
-[[package]]
 name = "embassy-futures"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -230,7 +164,6 @@ dependencies = [
  "critical-section",
  "defmt",
  "embassy-embedded-hal",
- "embassy-executor",
  "embassy-hal-internal",
  "embassy-sync",
  "embassy-time",
@@ -352,12 +285,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
 name = "futures-core"
 version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -389,12 +316,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
 name = "litrs"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -511,16 +432,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
 name = "syn"
-version = "2.0.109"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 3913104fc..841ce1903 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,24 +13,20 @@ cortex-m-rt = { version = "0.7", features = ["device"] }
 critical-section = "1.2.0"
 defmt = { version = "1.0", optional = true }
 embassy-embedded-hal = "0.5.0"
-embassy-executor = { version = "0.9.0", features = ["arch-cortex-m", "executor-interrupt", "executor-thread"], default-features = false }
 embassy-hal-internal = { version = "0.3.0", features = ["cortex-m", "prio-bits-3"] }
 embassy-sync = "0.7.2"
 embassy-time = "0.5.0"
 embassy-time-driver = "0.2.1"
-embedded-io = "0.6"
-heapless = "0.8"
-mcxa-pac = { git = "https://github.com/OpenDevicePartnership/mcxa-pac", features = ["rt"], rev = "3ab4c868f75a9240bb8fdce24982d34f2273aabf", version = "0.1.0" }
-paste = "1.0.15"
-
-embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [
-    "unproven",
-] }
 embedded-hal = { package = "embedded-hal", version = "1.0" }
+embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] }
 embedded-hal-async = { version = "1.0" }
 embedded-hal-nb = { version = "1.0" }
+embedded-io = "0.6"
 embedded-io-async = { version = "0.6.1" }
+heapless = "0.8"
+mcxa-pac = { git = "https://github.com/OpenDevicePartnership/mcxa-pac", features = ["rt"], rev = "3ab4c868f75a9240bb8fdce24982d34f2273aabf", version = "0.1.0" }
 nb = "1.1.0"
+paste = "1.0.15"
 
 [features]
 default = []
diff --git a/examples/.cargo/config.toml b/examples/.cargo/config.toml
index ecb11be64..aedc55b06 100644
--- a/examples/.cargo/config.toml
+++ b/examples/.cargo/config.toml
@@ -1,5 +1,5 @@
 [target.thumbv8m.main-none-eabihf]
-runner = 'probe-rs run --chip MCXA276 --preverify --verify'
+runner = 'probe-rs run --chip MCXA276 --preverify --verify --protocol swd --speed 12000'
 
 rustflags = [
   "-C", "linker=flip-link",
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
index b774aff97..b2ac9a051 100644
--- a/examples/Cargo.lock
+++ b/examples/Cargo.lock
@@ -240,7 +240,6 @@ dependencies = [
  "critical-section",
  "defmt",
  "embassy-embedded-hal",
- "embassy-executor",
  "embassy-hal-internal",
  "embassy-sync",
  "embassy-time",
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 6b100de42..d03d3d95c 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -19,3 +19,7 @@ embassy-time-driver = "0.2.1"
 embedded-io-async = "0.6.1"
 heapless = "0.9.2"
 panic-probe = { version = "1.0", features = ["print-defmt"] }
+
+[profile.release]
+lto = true # better optimizations
+debug = 2  # enough information for defmt/rtt locations
diff --git a/examples/memory.x b/examples/memory.x
index 528545b64..315ced58a 100644
--- a/examples/memory.x
+++ b/examples/memory.x
@@ -1,5 +1,5 @@
 MEMORY
 {
-    FLASH : ORIGIN = 0x20000000, LENGTH = 80K
-    RAM   : ORIGIN = 0x20014000, LENGTH = 48K
+    FLASH : ORIGIN = 0x00000000, LENGTH = 1M
+    RAM   : ORIGIN = 0x20000000, LENGTH = 128K
 }
diff --git a/examples/src/bin/blink.rs b/examples/src/bin/blink.rs
index 8c48e79f1..d8b158d50 100644
--- a/examples/src/bin/blink.rs
+++ b/examples/src/bin/blink.rs
@@ -26,6 +26,8 @@ async fn main(_spawner: Spawner) {
         init_led_gpio_clocks(hal::pac());
     }
 
+    defmt::info!("Blink example");
+
     // Initialize embassy-time global driver backed by OSTIMER0
     hal::ostimer::time_driver::init(hal::config::Config::default().time_interrupt_priority, 1_000_000);
 
@@ -41,6 +43,8 @@ async fn main(_spawner: Spawner) {
     // With pauses between letters and words
 
     loop {
+        defmt::info!("SOS");
+
         // S: three short blinks
         for _ in 0..3 {
             led.set_low();
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 60ebedf9b..2aba6b961 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -110,6 +110,11 @@ delta = "2.1.0 -> 2.1.1"
 [[audits.syn]]
 who = "Felipe Balbi <[email protected]>"
 criteria = "safe-to-deploy"
+version = "2.0.110"
+
+[[audits.syn]]
+who = "Felipe Balbi <[email protected]>"
+criteria = "safe-to-deploy"
 delta = "2.0.100 -> 2.0.109"
 
 [[audits.thiserror]]
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 5927b0b61..36a513ee2 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -181,10 +181,6 @@ criteria = "safe-to-deploy"
 version = "2.1.0"
 criteria = "safe-to-run"
 
-[[exemptions.syn]]
-version = "2.0.100"
-criteria = "safe-to-deploy"
-
 [[exemptions.typenum]]
 version = "1.18.0"
 criteria = "safe-to-deploy"