build(zCore): update Cargo.toml
@@ -64,26 +64,23 @@ log = "0.4"
cfg-if = "1.0"
spin = "0.9.4"
customizable-buddy = "0.0.3"
-bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "88e871a5" }
kernel-hal = { path = "../kernel-hal", default-features = false }
zcore-loader = { path = "../loader", default-features = false }
zircon-object = { path = "../zircon-object" }
+lock = { git = "https://github.com/DeathWish5/kernel-sync", rev = "8486b8" }
+executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler", rev = "e8cd353" }
+
linux-object = { path = "../linux-object", optional = true }
rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1a3246b", optional = true }
rcore-fs-sfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1a3246b", optional = true }
-lock = { git = "https://github.com/DeathWish5/kernel-sync", rev = "8486b8" }
-executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler", rev = "e8cd353" }
# LibOS mode
[target.'cfg(not(target_os = "none"))'.dependencies]
async-std = { version = "1.10", optional = true }
chrono = { version = "0.4", optional = true }
+bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "88e871a5" }
rcore-fs-hostfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1a3246b", optional = true }
-# Bare-metal mode
-[target.'cfg(target_os = "none")'.dependencies]
-buddy_system_allocator = "0.8"
-
# RISC-V
[target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
r0 = "1"
@@ -92,11 +89,13 @@ dtb-walker = "=0.2.0-alpha.3"
page-table = "0.0.6"
sbi-rt = { version = "0.0.2", features = ["legacy"] }
+# Bare-metal mode on aarch64
+[target.'cfg(all(target_os = "none", target_arch = "aarch64"))'.dependencies]
+rayboot = { git = "https://github.com/Luchangcheng2333/rayboot", rev = "b19c6c3" }
+
# Bare-metal mode on x86_64
[target.'cfg(all(target_os = "none", target_arch = "x86_64"))'.dependencies]
+bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "88e871a5" }
+buddy_system_allocator = "0.8"
rboot = { git = "https://github.com/rcore-os/rboot.git", rev = "ad21575", default-features = false }
# rvm = { git = "https://github.com/rcore-os/RVM", rev = "e91d625", optional = true }
-
-# Bare-metal mode on aarch64
-[target.'cfg(all(target_os = "none", target_arch = "aarch64"))'.dependencies]
-rayboot = { git = "https://github.com/Luchangcheng2333/rayboot", rev = "b19c6c3" }
