Update uefi crate to 0.36.1

Update from the custom Framework fork of uefi 0.20/uefi-services 0.17
to upstream uefi 0.36.1 from crates.io.

Key changes:
- Replace uefi-services with uefi's built-in global_allocator,
  panic_handler, and logger features
- Add uefi-raw 0.13 for direct access to shell protocol FFI
- Rewrite fw_uefi module to use the new boot:: global API instead of
  accessing BootServices through the system table
- Rewrite shell file I/O to use raw ShellProtocol FFI
- Simplify UEFI entry point (no more explicit Handle/SystemTable params)
- Remove custom git patches from Cargo.toml

Signed-off-by: Daniel Schaefer <dhs@frame.work>

Author: JohnAZoidberg

Cargo.lock

@@ -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

Cargo.toml

@@ -87,7 +87,6 @@
         gitDependencyHashes = {
           "redox_hwio-0.1.6" = "sha256-knLIZ7yp42SQYk32NGq3SUGvJFVumFhD64Njr5TRdFs=";
           "smbios-lib-0.9.1" = "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo=";
-          "uefi-0.20.0" = "sha256-2lUd2a+7NvS94LyAHE2BwGV4j6607mbPXE5htrwdz04=";
         };
 
         # Build function for the CLI tool (Linux/macOS)

flake.nix

@@ -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/Cargo.toml

@@ -4,9 +4,8 @@ use alloc::vec::Vec;
 
 #[allow(unused_imports)]
 use log::{debug, error, info, trace};
-use uefi::prelude::BootServices;
-use uefi::proto::shell_params::*;
-use uefi::Handle;
+use uefi::boot;
+use uefi::proto::shell_params::ShellParameters;
 
 use crate::chromium_ec::commands::SetGpuSerialMagic;
 use crate::chromium_ec::{CrosEcDriverType, HardwareDeviceType};
@@ -15,13 +14,19 @@ use crate::commandline::{Cli, LogLevel};
 use super::{ConsoleArg, FpBrightnessArg, InputDeckModeArg, RebootEcArg, TabletModeArg};
 
 /// Get commandline arguments from UEFI environment
-pub fn get_args(bs: &BootServices, image_handle: Handle) -> Vec<String> {
-    if let Ok(shell_params) = bs.open_protocol_exclusive::<ShellParameters>(image_handle) {
-        shell_params.get_args()
-    } else {
-        // No protocol found if the application wasn't executed by the shell
-        vec![]
-    }
+pub fn get_args() -> Vec<String> {
+    let shell_params = uefi::boot::open_protocol_exclusive::<ShellParameters>(boot::image_handle());
+    let shell_params = match shell_params {
+        Ok(s) => s,
+        Err(_e) => {
+            error!("Failed to get ShellParameters protocol");
+            // TODO: Return result
+            // return e.status();
+            return vec![];
+        }
+    };
+    let args: Vec<String> = shell_params.args().map(|x| x.to_string()).collect();
+    args
 }
 
 pub fn parse(args: &[String]) -> Cli {