Skip to content

Commit 83d8daf

Browse files
committed
add
1 parent 6a55c53 commit 83d8daf

File tree

4 files changed

+26
-12
lines changed

4 files changed

+26
-12
lines changed

Cargo.lock

Lines changed: 19 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platforms/axplat-aarch64-dyn/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ version = "0.1.0"
1111
[dependencies]
1212
axconfig-macros = "0.2"
1313
axplat = {git = "https://github.com/arceos-org/axplat_crates"}
14-
pie-boot = {version = "0.1.11"}
14+
pie-boot = {version = "0.2.1"}

platforms/axplat-aarch64-dyn/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::path::PathBuf;
2+
13
fn main() {
24
println!("cargo:rerun-if-env-changed=AX_CONFIG_PATH");
35
if let Ok(config_path) = std::env::var("AX_CONFIG_PATH") {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#![cfg(all(target_arch = "aarch64", target_os = "none"))]
1+
#![cfg(target_arch = "aarch64")]
22
#![no_std]
33

44
#[macro_use]
55
extern crate axplat;
66

7-
use pie_boot::BootArgs;
7+
use pie_boot::BootInfo;
88

99
mod console;
1010
mod init;
@@ -18,7 +18,7 @@ mod config {
1818
}
1919

2020
#[pie_boot::entry]
21-
fn main(_args: &BootArgs) -> ! {
21+
fn main(args: &BootInfo) -> ! {
2222
// TODO: Implement actual bootstrap logic
23-
axplat::call_main(0, 0);
23+
axplat::call_main(args.cpu_id, args.fdt.map(|p| p.as_ptr() as usize).unwrap_or_default());
2424
}

0 commit comments

Comments
 (0)