Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# [patch."https://github.com/arceos-hypervisor/axvm.git".axvm]
# path = "crates/axvm"

[target.aarch64-unknown-none-softfloat]
rustflags = [
"-Clink-args=-no-pie",
Expand All @@ -20,3 +17,4 @@ rustflags = [

[alias]
xtask = "run --package xtask --"

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ __pycache__/
/crates/*
!/crates/nop/
!/crates/nop/**
.devspace/

/Cargo.toml.bk

Expand Down
Empty file added .gitmodules
Empty file.
4 changes: 2 additions & 2 deletions modules/axconfig/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub mod devices {
#[doc = " End PCI bus number."]
pub const PCI_BUS_END: usize = 0xff;
#[doc = " Base physical address of the PCIe ECAM space."]
pub const PCI_ECAM_BASE: usize = 0xb000_0000 ;
pub const PCI_ECAM_BASE: usize = 0xb000_0000;
#[doc = " PCI device memory ranges."]
pub const PCI_RANGES: &[(usize, usize)] = &[];
#[doc = " Timer interrupt num (PPI, physical timer)."]
Expand All @@ -55,7 +55,7 @@ pub mod plat {
#[doc = " Kernel address space size."]
pub const KERNEL_ASPACE_SIZE: usize = 0x0000_7fff_ffff_f000;
#[doc = " No need."]
pub const KERNEL_BASE_PADDR: usize = 0x20_0000 ;
pub const KERNEL_BASE_PADDR: usize = 0x20_0000;
#[doc = " Base virtual address of the kernel image."]
pub const KERNEL_BASE_VADDR: usize = 0xffff_8000_0020_0000;
#[doc = " Offset of bus address and phys address. some boards, the bus address is"]
Expand Down
2 changes: 1 addition & 1 deletion platform/x86-qemu-q35/src/mp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ core::arch::global_asm!(
);

unsafe fn setup_startup_page(stack_top: PhysAddr) {
unsafe extern "C" {
unsafe extern {
fn ap_entry32();
fn ap_start();
fn ap_end();
Expand Down
14 changes: 6 additions & 8 deletions xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,16 @@ version = "0.1.0"
anyhow = "1.0"
cargo_metadata = "0.23"
chrono = "0.4"
clap = { version = "4.4", features = ["derive"] }
clap = {version = "4.4", features = ["derive"]}
colored = "3"
ostool = "0.8"
jkconfig = "0.1"
ostool = "0.8"
reqwest = "0.12"
schemars = { version = "1", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
schemars = {version = "1", features = ["derive"]}
serde = {version = "1.0", features = ["derive"]}
serde_json = "1"
sha2 = "0.10"
tokio = { version = "1", features = ["full"] }
tokio = {version = "1", features = ["full"]}
toml.workspace = true

axvmconfig = { workspace = true, features = ["std"] }


axvmconfig = {workspace = true, features = ["std"]}
4 changes: 2 additions & 2 deletions xtask/src/cargo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::ctx::Context;
impl Context {
pub async fn run_qemu(&mut self, config_path: Option<PathBuf>) -> anyhow::Result<()> {
let build_config = self.load_config()?;

let arch = if build_config.target.contains("aarch64") {
Arch::Aarch64
} else if build_config.target.contains("x86_64") {
Expand All @@ -18,7 +18,7 @@ impl Context {
build_config.target
));
};

let config_path = if let Some(path) = config_path {
path
} else {
Expand Down
Loading
Loading