mirror of
https://github.com/panpaul/tiny_os
synced 2024-09-20 17:55:20 +08:00
feat: use workspace
This commit is contained in:
parent
262354cb28
commit
613512e329
6
.github/workflows/rust.yml
vendored
6
.github/workflows/rust.yml
vendored
@ -1,10 +1,6 @@
|
|||||||
name: Rust
|
name: Rust
|
||||||
|
|
||||||
on:
|
on: [ push, pull_request ]
|
||||||
push:
|
|
||||||
branches: [ "dev" ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ "dev" ]
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
|
28
Cargo.lock
generated
28
Cargo.lock
generated
@ -38,6 +38,20 @@ version = "1.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
|
checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "kernel"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.4.2",
|
||||||
|
"lazy_static",
|
||||||
|
"log",
|
||||||
|
"riscv",
|
||||||
|
"sbi-rt",
|
||||||
|
"spin 0.9.8",
|
||||||
|
"static_assertions",
|
||||||
|
"uart_16550",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy_static"
|
name = "lazy_static"
|
||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
@ -130,20 +144,6 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tiny_os"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags 2.4.2",
|
|
||||||
"lazy_static",
|
|
||||||
"log",
|
|
||||||
"riscv",
|
|
||||||
"sbi-rt",
|
|
||||||
"spin 0.9.8",
|
|
||||||
"static_assertions",
|
|
||||||
"uart_16550",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uart_16550"
|
name = "uart_16550"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
|
40
Cargo.toml
40
Cargo.toml
@ -1,37 +1,3 @@
|
|||||||
[package]
|
[workspace]
|
||||||
name = "tiny_os"
|
resolver = "2"
|
||||||
version = "0.1.0"
|
members = ["kernel"]
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["arch_riscv64", "board_virt", "log_color", "frame_freelist"]
|
|
||||||
|
|
||||||
arch_riscv64 = []
|
|
||||||
arch_riscv32 = []
|
|
||||||
|
|
||||||
board_default = []
|
|
||||||
board_virt = []
|
|
||||||
board_thead = []
|
|
||||||
|
|
||||||
log_color = []
|
|
||||||
|
|
||||||
frame_bitmap = []
|
|
||||||
frame_freelist = []
|
|
||||||
|
|
||||||
[profile.dev]
|
|
||||||
panic = "abort"
|
|
||||||
|
|
||||||
[profile.release]
|
|
||||||
panic = "abort"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
bitflags = "2.4.1"
|
|
||||||
lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
|
|
||||||
log = "0.4"
|
|
||||||
riscv = { version = "0.11.1", features = ["s-mode"] }
|
|
||||||
sbi-rt = { version = "0.0.3", features = ["legacy"] }
|
|
||||||
spin = "0.9.8"
|
|
||||||
static_assertions = "1.1.0"
|
|
||||||
uart_16550 = "0.3"
|
|
||||||
|
37
kernel/Cargo.toml
Normal file
37
kernel/Cargo.toml
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
[package]
|
||||||
|
name = "kernel"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = ["arch_riscv64", "board_virt", "log_color", "frame_freelist"]
|
||||||
|
|
||||||
|
arch_riscv64 = []
|
||||||
|
arch_riscv32 = []
|
||||||
|
|
||||||
|
board_default = []
|
||||||
|
board_virt = []
|
||||||
|
board_thead = []
|
||||||
|
|
||||||
|
log_color = []
|
||||||
|
|
||||||
|
frame_bitmap = []
|
||||||
|
frame_freelist = []
|
||||||
|
|
||||||
|
[profile.dev]
|
||||||
|
panic = "abort"
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
panic = "abort"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
bitflags = "2.4.1"
|
||||||
|
lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
|
||||||
|
log = "0.4"
|
||||||
|
riscv = { version = "0.11.1", features = ["s-mode"] }
|
||||||
|
sbi-rt = { version = "0.0.3", features = ["legacy"] }
|
||||||
|
spin = "0.9.8"
|
||||||
|
static_assertions = "1.1.0"
|
||||||
|
uart_16550 = "0.3"
|
@ -9,11 +9,11 @@ fn main() {
|
|||||||
const TARGET_LDS: &[TargetConfig] = &[
|
const TARGET_LDS: &[TargetConfig] = &[
|
||||||
TargetConfig {
|
TargetConfig {
|
||||||
target: "riscv64",
|
target: "riscv64",
|
||||||
lds: "src/arch/riscv/linker.ld",
|
lds: "kernel/src/arch/riscv/linker.ld",
|
||||||
},
|
},
|
||||||
TargetConfig {
|
TargetConfig {
|
||||||
target: "riscv32",
|
target: "riscv32",
|
||||||
lds: "src/arch/riscv/linker.ld",
|
lds: "kernel/src/arch/riscv/linker.ld",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
@ -1,5 +1,4 @@
|
|||||||
use bitflags::bitflags;
|
use bitflags::bitflags;
|
||||||
use static_assertions::assert_eq_size;
|
|
||||||
|
|
||||||
use crate::mm::addr::{AddressOps, PhysAddr};
|
use crate::mm::addr::{AddressOps, PhysAddr};
|
||||||
use crate::mm::page;
|
use crate::mm::page;
|
Loading…
Reference in New Issue
Block a user