diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock index fd0bb62..cd44b9f 100644 --- a/kernel/Cargo.lock +++ b/kernel/Cargo.lock @@ -253,8 +253,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "simple-filesystem" -version = "0.0.1" -source = "git+https://github.com/benpigchu/SimpleFileSystem-Rust?branch=ucore-fs-enhance#b216da64ce4ee9cb24059478ffd4fa80ab8f30d2" +version = "0.1.0" +source = "git+https://github.com/wangrunji0408/SimpleFileSystem-Rust#48b3c2618a9589490a2b327844740a9fe1950b11" dependencies = [ "bit-vec 0.5.0 (git+https://github.com/AltSysrq/bit-vec.git)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -324,7 +324,7 @@ dependencies = [ "pc-keyboard 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "riscv 0.3.0 (git+https://github.com/riscv-and-rust-and-decaf/riscv)", - "simple-filesystem 0.0.1 (git+https://github.com/benpigchu/SimpleFileSystem-Rust?branch=ucore-fs-enhance)", + "simple-filesystem 0.1.0 (git+https://github.com/wangrunji0408/SimpleFileSystem-Rust)", "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "uart_16550 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ucore-memory 0.1.0", @@ -467,7 +467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum simple-filesystem 0.0.1 (git+https://github.com/benpigchu/SimpleFileSystem-Rust?branch=ucore-fs-enhance)" = "" +"checksum simple-filesystem 0.1.0 (git+https://github.com/wangrunji0408/SimpleFileSystem-Rust)" = "" "checksum skeptic 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "061203a849117b0f7090baf8157aa91dac30545208fbb85166ac58b4ca33d89c" "checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f" "checksum static_assertions 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "389ce475f424f267dbed6479cbd8f126c5e1afb053b0acdaa019c74305fc65d1" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 4ce05c3..1fd50a7 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -1,18 +1,28 @@ [package] name = "ucore" version = "0.1.0" -authors = ["Runji Wang "] edition = "2018" +authors = [ + "WangRunji ", + "Ben Pig Chu ", + "dzy ", + "equation314 ", + "cfgbd ", + "koumingyang <1761674434@qq.com>", + "lcy1996 <992195697@qq.com>", + "chenqiuhao ", + "maoyuchaxue " +] [features] -# Without BBL (for riscv32 FPGA board) -no_bbl = [] -# Disable paging (for riscv32) +# Disable paging (for riscv) no_mmu = [] -# Kernel in M-mode (for riscv32) +# Kernel in M-mode (for riscv) m_mode = ["no_mmu"] # (for aarch64 RaspberryPi3) board_raspi3 = ["bcm2837"] +# (for riscv64) +board_k210 = ["m_mode"] raspi3_use_generic_timer = ["bcm2837/use_generic_timer"] [profile.dev] @@ -35,13 +45,11 @@ lazy_static = { version = "1.2", features = ["spin_no_std"] } bit-allocator = { path = "../crate/bit-allocator" } ucore-memory = { path = "../crate/memory" } ucore-process = { path = "../crate/process" } -simple-filesystem = { git = "https://github.com/wangrunji0408/SimpleFileSystem-Rust", branch = "multi-thread" } +simple-filesystem = { git = "https://github.com/wangrunji0408/SimpleFileSystem-Rust" } [target.'cfg(target_arch = "x86_64")'.dependencies] bootloader = { git = "https://github.com/wangrunji0408/bootloader" } apic = { git = "https://github.com/wangrunji0408/APIC-Rust" } -#bootloader = { path = "../crate/bootloader" } -#apic = { path = "../crate/apic" } x86_64 = "0.3" raw-cpuid = "6.0" uart_16550 = "0.1" @@ -56,9 +64,6 @@ aarch64 = { git = "https://github.com/equation314/aarch64" } atags = { path = "../crate/atags" } bcm2837 = { path = "../crate/bcm2837", optional = true } -[patch.'https://github.com/wangrunji0408/SimpleFileSystem-Rust'] -simple-filesystem = { git = "https://github.com/benpigchu/SimpleFileSystem-Rust", branch = "ucore-fs-enhance" } - [package.metadata.bootimage] default-target = "x86_64-blog_os.json" output = "target/x86_64-blog_os/bootimage.bin" diff --git a/kernel/Makefile b/kernel/Makefile index 5422300..2f9439e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -14,8 +14,8 @@ # LOG = off | error | warn | info | debug | trace # SFSIMG = SFS image path of user programs # smp = 1 | 2 | ... SMP core number -# board = none Running on qemu -# | fpga Only available on riscv32, build without bbl, run on board +# board = none Running on QEMU +# | k210 Only available on riscv64, build without bbl, run on K210 # | raspi3 Only available on aarch64, run on Raspberry Pi 3 Model B/B+ # m_mode Only available on riscv32, build for M-Mode, without MMU @@ -42,6 +42,9 @@ export SFSIMG = $(user_dir)/img/ucore-i386.img else export SFSIMG = $(user_dir)/img/ucore-$(arch).img endif +ifeq ($(arch), aarch64) +board := raspi3 +endif ### qemu options ### qemu_opts := \ @@ -75,12 +78,6 @@ qemu_opts += -d $(d) endif ### build args ### -ifeq ($(arch), riscv32) -ifeq ($(board), fpga) -features += no_bbl -endif -endif - ifeq ($(board), raspi3) # qemu only has generic timer # TODO: configure system/generic timer automatically