Update uefi to 0.35+

.github/workflows/ci.yml

@@ -106,6 +106,25 @@ jobs:
         name: UEFI-Shell-fwk.iso
         path: framework_uefi/build/x86_64-unknown-uefi/UEFI-Shell-fwk.iso
 
+  test-uefi:
+    name: Test UEFI
+    runs-on: ubuntu-24.04
+    env:
+      CARGO_NET_GIT_FETCH_WITH_CLI: true
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Rust toolchain
+      run: rustup show
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y mtools parted qemu-system-x86
+
+    - name: Run UEFI tests in QEMU
+      run: make -C framework_uefi test
+
   build-windows:
     name: Build Windows
     runs-on: windows-2022

.gitignore

@@ -19,3 +19,6 @@ result*
 
 # Claude Code
 tmpclaude*
+
+# UEFI test artifacts
+dump.bmp

Cargo.toml

@@ -19,9 +19,5 @@ default-members = [
     "framework_tool",
 ]
 
-[patch.crates-io]
-uefi = { git = "https://github.com/FrameworkComputer/uefi-rs", branch = "merged" }
-uefi-services = { git = "https://github.com/FrameworkComputer/uefi-rs", branch = "merged" }
-
 [profile.release]
 lto = true

framework_lib/Cargo.toml

@@ -37,8 +37,8 @@ rusb = { version = "0.9.4", optional = true }
 guid-create = { version = "0.5.0", default-features = false }
 
 [target.'cfg(target_os = "uefi")'.dependencies]
-uefi = { version = "0.20", features = ["alloc"] }
-uefi-services = "0.17"
+uefi = { version = "0.36.1", features = ["alloc", "global_allocator", "panic_handler", "logger"] }
+uefi-raw = "0.13"
 plain = "0.2.3"
 redox_hwio = { git = "https://github.com/FrameworkComputer/rust-hwio", branch = "freebsd", default-features = false }
 smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std", default-features = false }

framework_lib/src/capsule.rs

@@ -183,7 +183,7 @@ pub fn dump_winux_image(data: &[u8], header: &DisplayCapsule, filename: &str) {
     }
     #[cfg(feature = "uefi")]
     {
-        let ret = crate::uefi::fs::shell_write_file(filename, image);
+        let ret = crate::fw_uefi::fs::shell_write_file(filename, image);
         if let Err(err) = ret {
             println!("Failed to dump winux image: {:?}", err);
         }

framework_lib/src/chromium_ec/mod.rs

@@ -9,11 +9,11 @@
 //! - `windows` - It uses [DHowett's Windows driver](https://github.com/DHowett/FrameworkWindowsUtils)
 
 use crate::ec_binary;
+#[cfg(feature = "uefi")]
+use crate::fw_uefi::shell_get_execution_break_flag;
 use crate::os_specific;
 use crate::power;
 use crate::smbios;
-#[cfg(feature = "uefi")]
-use crate::uefi::shell_get_execution_break_flag;
 use crate::util::{self, Platform};
 
 use no_std_compat::time::Duration;