Merge branch 'main' into fix/kstack-leak

2023-02-08 11:08:27 +08:00 · 2023-02-08 11:08:27 +08:00 · 2dc89534a4
commit 2dc89534a4
parent 1df9c1a98d 09232ae31f
106 changed files with 3974 additions and 2260 deletions
--- a/user/Cargo.toml
+++ b/user/Cargo.toml
@ -10,10 +10,10 @@ edition = "2018"
 buddy_system_allocator = "0.6"
 bitflags = "1.2.1"
 riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
+lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
+embedded-graphics = "0.7.1"
+oorandom ="11"
+virtio-input-decoder = "0.1.4"

 [profile.release]
 debug = true
-
-[features]
-board_qemu = []
-board_k210 = []