Upgrade uefi crate from v0.20 to v0.36

Migrate from uefi v0.20 + uefi-services to uefi v0.36 + uefi-raw.

Key API changes:
- Entry point: fn main(Handle, SystemTable<Boot>) -> fn main() -> Status
- uefi_services::init() -> uefi::helpers::init()
- boot_services.method() -> uefi::boot::method()
- uefi_services::system_table() -> uefi::system::with_config_table()
- Shell protocol accessed via uefi_raw::protocol::shell::ShellProtocol
  (the safe wrapper's ShellProtocol is not public in v0.36)
- Config table GUIDs: SMBIOS_GUID/SMBIOS3_GUID -> ConfigTableEntry::*
- ESRT GUID: manual GUID comparison -> ConfigTableEntry::ESRT_GUID
- bs.stall(usize) -> uefi::boot::stall(Duration)
- ShellParameters: get_args(bs, handle) -> args() iterator on image_handle

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

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

@@ -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::fw_uefi::shell_get_execution_break_flag;
 use crate::util::{self, Platform};
 
 use no_std_compat::time::Duration;

framework_lib/src/chromium_ec/mod.rs

@@ -47,6 +47,8 @@ use crate::chromium_ec::{EcError, EcResult};
 use crate::csme;
 use crate::ec_binary;
 use crate::esrt::{self, ResourceType};
+#[cfg(feature = "uefi")]
+use crate::fw_uefi::enable_page_break;
 #[cfg(feature = "rusb")]
 use crate::inputmodule::check_inputmodule_version;
 #[cfg(target_os = "linux")]
@@ -61,8 +63,6 @@ use crate::smbios::{dmidecode_string_val, get_smbios, is_framework};
 use crate::touchpad::print_touchpad_fw_ver;
 #[cfg(feature = "hidapi")]
 use crate::touchscreen;
-#[cfg(feature = "uefi")]
-use crate::fw_uefi::enable_page_break;
 #[cfg(feature = "rusb")]
 use crate::usbhub::check_usbhub_version;
 use crate::util::{self, Config, Platform, PlatformFamily};