diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f84027bf..15507f55 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,10 +8,6 @@ updates: schedule: interval: "weekly" timezone: "Europe/Berlin" - groups: - uefi: - patterns: - - "uefi*" - package-ecosystem: "github-actions" directory: "/" diff --git a/Cargo.lock b/Cargo.lock index 7bd5d7f5..8f7b7185 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,6 @@ dependencies = [ "take-static", "uart_16550", "uefi", - "uefi-services", "vm-fdt", "x86_64", ] @@ -651,13 +650,15 @@ dependencies = [ [[package]] name = "uefi" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ee9c34c612d45735fef4c478450cd2a1e64e59ad1e5988e5024af53914a854" +checksum = "a9c0a56dc9fed2589aad6ddca11c2584968fc21f227b5d7083bb8961d26a69fa" dependencies = [ "bitflags 2.5.0", + "cfg-if", "log", "ptr_meta", + "qemu-exit", "ucs2", "uefi-macros", "uefi-raw", @@ -677,27 +678,15 @@ dependencies = [ [[package]] name = "uefi-raw" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cc02890e65b2b8e390d0e081907c0d5ac3931bc6935f452095d68199e3698c5" +checksum = "efa8716f52e8cab8bcedfd5052388a0f263b69fe5cc2561548dc6a530678333c" dependencies = [ "bitflags 2.5.0", "ptr_meta", "uguid", ] -[[package]] -name = "uefi-services" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292d48d6dae6fb4a5f960bab64a72e9dcdbe3db7dd706ae0ace5de24580d2840" -dependencies = [ - "cfg-if", - "log", - "qemu-exit", - "uefi", -] - [[package]] name = "uguid" version = "2.2.0" diff --git a/Cargo.toml b/Cargo.toml index e871dc7c..72748a8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,8 +38,7 @@ exclusive_cell = "0.1" spinning_top = "0.3" [target.'cfg(target_os = "uefi")'.dependencies] -uefi = { version = "0.27", features = ["alloc"] } -uefi-services = { version = "0.24", default-features = false, features = ["panic_handler", "qemu"] } +uefi = { version = "0.28", features = ["alloc", "global_allocator", "panic_handler", "qemu"] } qemu-exit = "3" [target.'cfg(target_arch = "riscv64")'.dependencies] diff --git a/src/os/uefi/console.rs b/src/os/uefi/console.rs index d680b7fb..00d5b5fd 100644 --- a/src/os/uefi/console.rs +++ b/src/os/uefi/console.rs @@ -29,7 +29,7 @@ impl Console { fn init(&mut self) { assert!(matches!(self, Console::None)); unsafe { - uefi_services::system_table() + uefi::helpers::system_table() .boot_services() .create_event( EventType::SIGNAL_EXIT_BOOT_SERVICES, @@ -50,7 +50,7 @@ impl fmt::Write for Console { self.init(); self.write_str(s)?; } - Console::BootServices => uefi_services::system_table().stdout().write_str(s)?, + Console::BootServices => uefi::helpers::system_table().stdout().write_str(s)?, Console::Native { console } => console.write_bytes(s.as_bytes()), } Ok(()) diff --git a/src/os/uefi/mod.rs b/src/os/uefi/mod.rs index 19d7fba4..9c0978c9 100644 --- a/src/os/uefi/mod.rs +++ b/src/os/uefi/mod.rs @@ -13,7 +13,7 @@ pub use self::console::CONSOLE; // Entry Point of the Uefi Loader #[entry] fn loader_main(_handle: Handle, mut system_table: SystemTable) -> Status { - uefi_services::init(&mut system_table).unwrap(); + uefi::helpers::init(&mut system_table).unwrap(); crate::log::init(); let app = read_app(system_table.boot_services());