diff --git a/integration-test/bins/Cargo.lock b/integration-test/bins/Cargo.lock index c888c2ec..d2a939db 100644 --- a/integration-test/bins/Cargo.lock +++ b/integration-test/bins/Cargo.lock @@ -95,15 +95,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "multiboot" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87ad3b7b7bcf5da525c22221e3eb3a020cd68b2d55ae62f629c15e8bc3bd56e" -dependencies = [ - "paste", -] - [[package]] name = "multiboot2" version = "0.22.2" @@ -143,7 +134,6 @@ dependencies = [ "elf_rs", "good_memory_allocator", "log", - "multiboot", "multiboot2", "multiboot2-header", "util", @@ -170,12 +160,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "proc-macro2" version = "1.0.86" diff --git a/integration-test/bins/multiboot2_chainloader/src/loader.rs b/integration-test/bins/multiboot2_chainloader/src/loader.rs index d7465e7d..2574a870 100644 --- a/integration-test/bins/multiboot2_chainloader/src/loader.rs +++ b/integration-test/bins/multiboot2_chainloader/src/loader.rs @@ -1,9 +1,10 @@ use alloc::boxed::Box; +use alloc::vec::Vec; use elf_rs::{ElfFile, ProgramHeaderEntry, ProgramType}; use log::{debug, info}; use multiboot2::{ - BootLoaderNameTag, CommandLineTag, MaybeDynSized, MemoryArea, MemoryAreaType, MemoryMapTag, - ModuleTag, SmbiosTag, + BootLoaderNameTag, CommandLineTag, EFIMemoryAreaType, MaybeDynSized, MemoryArea, + MemoryAreaType, MemoryMapTag, ModuleTag, SmbiosTag, }; fn get_free_mmap_areas( @@ -92,9 +93,9 @@ pub fn load_module(mbi: &multiboot2::BootInformation) -> ! { MemoryAreaType::Reserved, )])) .add_module(ModuleTag::new( - elf_mod.start as u32, - elf_mod.end as u32, - elf_mod.string.unwrap(), + elf_mod.start_address() as u32, + elf_mod.end_address() as u32, + elf_mod.cmdline().unwrap(), )) // Test that we can add SmbiosTag multiple times. .add_smbios(SmbiosTag::new(1, 1, &[1, 2, 3]))