From d142df059ed6d600b7cd71b924b60e3739fc27d4 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@pm.me>
Date: Mon, 6 Oct 2025 19:01:10 +0200
Subject: [PATCH] some fixes for QSPI flasher script

---
 examples/embassy/Cargo.toml                     | 4 ++--
 examples/embassy/src/bin/logger-non-blocking.rs | 2 +-
 zedboard-qspi-flasher/qspi-flasher.tcl          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/embassy/Cargo.toml b/examples/embassy/Cargo.toml
index b2aaa27..b616e9d 100644
--- a/examples/embassy/Cargo.toml
+++ b/examples/embassy/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["no-std", "arm", "cortex-a", "amd", "zynq7000"]
 categories = ["embedded", "no-std", "hardware-support"]
 
 [dependencies]
-cortex-ar = "0.3"
+cortex-ar = { version = "0.3", features = ["critical-section-single-core"] }
 zynq7000-rt = { path = "../../zynq7000-rt" }
 zynq7000 = { path = "../../zynq7000" }
 zynq7000-hal = { path = "../../zynq7000-hal" }
@@ -25,7 +25,7 @@ embedded-hal = "1"
 fugit = "0.3"
 log = "0.4"
 
-embassy-executor = { git = "https://github.com/us-irs/embassy.git", branch = "cortex-ar-update", features = [
+embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", features = [
   "arch-cortex-ar",
   "executor-thread",
 ]}
diff --git a/examples/embassy/src/bin/logger-non-blocking.rs b/examples/embassy/src/bin/logger-non-blocking.rs
index 3c09354..1fd3eac 100644
--- a/examples/embassy/src/bin/logger-non-blocking.rs
+++ b/examples/embassy/src/bin/logger-non-blocking.rs
@@ -79,7 +79,7 @@ async fn main(spawner: Spawner) -> ! {
     info!("Boot mode: {:?}", boot_mode);
 
     let led = Output::new_for_mio(mio_pins.mio7, PinState::Low);
-    spawner.spawn(led_task(led)).unwrap();
+    spawner.spawn(led_task(led).unwrap());
     let mut log_buf: [u8; 2048] = [0; 2048];
     let frame_queue = zynq7000_hal::log::rb::get_frame_queue();
     loop {
diff --git a/zedboard-qspi-flasher/qspi-flasher.tcl b/zedboard-qspi-flasher/qspi-flasher.tcl
index 6004dd9..5c49727 100644
--- a/zedboard-qspi-flasher/qspi-flasher.tcl
+++ b/zedboard-qspi-flasher/qspi-flasher.tcl
@@ -37,7 +37,7 @@ foreach arg $argv {
   if {!$endopts && [string match "-*" $arg]} {
     if {$arg eq "--"} { set endopts 1; continue }
     if {$arg eq "-h" || $arg eq "--help"} { usage; exit 0 }
-    if {$arg eq "-b" || $arg eq "--bin"} { set expecting app; continue }
+    if {$arg eq "-b" || $arg eq "--bin"} { set expecting bin; continue }
     puts "error: unknown option: $arg"; usage; exit 1
   }
 
@@ -84,7 +84,7 @@ if {$bin ne ""} {
 }
 
 if {$bin eq ""} {
-  puts "error: boot.bin binary required as BOOTBIN environment"
+  puts "error: boot.bin binary required"
   usage
   exit 1
 }