Compare commits

..

No commits in common. "3e197b98820eee31996b20a4d2b70dafe0441256" and "41a450393ebf3a24085874c7e2738d71cc5fad33" have entirely different histories.

4 changed files with 12 additions and 23 deletions

View file

@ -1,9 +1,8 @@
# .cargo/config.toml
[build]
target = "riscv64imac-unknown-none-elf"
target = "riscv32imac-unknown-none-elf"
# options for riscv32 (not currently in use)
[target.riscv32imac-unknown-none-elf]
runner = """ qemu-system-riscv32
-cpu rv32
@ -13,13 +12,3 @@ runner = """ qemu-system-riscv32
-nographic
-serial mon:stdio
-bios """
[target.riscv64imac-unknown-none-elf]
runner = """ qemu-system-riscv64
-cpu rv64
-machine virt
-m 150M
-s
-nographic
-serial mon:stdio
-bios """

14
Cargo.lock generated
View file

@ -8,13 +8,6 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"spinning_top",
]
[[package]]
name = "lock_api"
version = "0.4.12"
@ -25,6 +18,13 @@ dependencies = [
"scopeguard",
]
[[package]]
name = "riscv-uefi"
version = "0.1.0"
dependencies = [
"spinning_top",
]
[[package]]
name = "scopeguard"
version = "1.2.0"

View file

@ -1,5 +1,5 @@
[package]
name = "kernel"
name = "riscv-uefi"
version = "0.1.0"
edition = "2021"

View file

@ -1,8 +1,8 @@
// build.rs
fn main() {
// Tell ld to use linker script.
println!("cargo::rustc-link-arg=-Tsrc/script.ld");
// Use the linker script.
println!("cargo:rustc-link-arg=-Tsrc/script.ld");
// Don't do any magic linker stuff.
println!("cargo::rustc-link-arg=--omagic");
println!("cargo:rustc-link-arg=--omagic");
}