update

Author: ZR233

Cargo.lock

@@ -11,7 +11,7 @@ version = "0.1.0"
 [dependencies]
 axconfig-macros = "0.2"
 axplat = {git = "https://github.com/arceos-org/axplat_crates"}
-pie-boot = {version = "0.2.1"}
+pie-boot = {version = "0.2.2"}
 any-uart = "0.2.11"
 spin = "0.10"
 axcpu = { workspace = true }

platforms/axplat-aarch64-dyn/Cargo.toml

@@ -3,10 +3,9 @@ use core::ptr::NonNull;
 use any_uart::{Receiver, Sender};
 use axplat::console::ConsoleIf;
 use fdt_parser::Fdt;
+use pie_boot::boot_info;
 use spin::Mutex;
 
-use crate::boot_info;
-
 static TX: Mutex<Option<Sender>> = Mutex::new(None);
 static RX: Mutex<Option<Receiver>> = Mutex::new(None);
 
@@ -74,7 +73,7 @@ fn getchar() -> Option<u8> {
     let mut g = RX.lock();
     if let Some(rx) = g.as_mut() {
         any_uart::block!(rx.read()).ok()
-    }else{
+    } else {
         None
     }
 }

platforms/axplat-aarch64-dyn/src/console.rs

@@ -18,20 +18,10 @@ mod config {
     axconfig_macros::include_configs!(path_env = "AX_CONFIG_PATH", fallback = "axconfig.toml");
 }
 
-// Use `.data` section to prevent being cleaned by `clean_bss`.
-#[unsafe(link_section = ".data")]
-static BOOT_INFO: Once<BootInfo> = Once::new();
-
 #[pie_boot::entry]
 fn main(args: &BootInfo) -> ! {
-    BOOT_INFO.call_once(move || args.clone());
-
     axplat::call_main(
         args.cpu_id,
         args.fdt.map(|p| p.as_ptr() as usize).unwrap_or_default(),
     );
 }
-
-fn boot_info() -> &'static BootInfo {
-    BOOT_INFO.wait()
-}

platforms/axplat-aarch64-dyn/src/lib.rs

@@ -1,10 +1,8 @@
 use axplat::mem::{MemIf, RawRange};
 use heapless::Vec;
-use pie_boot::MemoryRegionKind;
+use pie_boot::{MemoryRegionKind, boot_info};
 use spin::{Mutex, Once};
 
-use crate::boot_info;
-
 struct MemIfImpl;
 
 static RAM_LIST: Once<Vec<RawRange, 32>> = Once::new();