Compare commits

..

1 Commits

Author SHA1 Message Date
Philipp Oppermann
4273cde4b0 The x86_64-unknown-none target defaults to panic=abort
So we don't need to override the panic strategy anymore.
2023-04-30 13:50:00 +02:00
4 changed files with 14 additions and 24 deletions

9
Cargo.lock generated
View File

@@ -2,15 +2,6 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 3
[[package]]
name = "bootloader_api"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec2d46a2b93edb1383023db2a95fc9480847a6e137c60e214f3fb62727f028da"
[[package]] [[package]]
name = "kernel" name = "kernel"
version = "0.1.0" version = "0.1.0"
dependencies = [
"bootloader_api",
]

View File

@@ -6,10 +6,3 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bootloader_api = "0.11.0"
[profile.dev]
panic = "abort"
[profile.release]
panic = "abort"

View File

@@ -1,16 +1,23 @@
# Blog OS (Booting) # Blog OS (Minimal Kernel)
[![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-3.2)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-3.2) [![Build Status](https://github.com/phil-opp/blog_os/workflows/Code/badge.svg?branch=post-3.1)](https://github.com/phil-opp/blog_os/actions?query=workflow%3A%22Code%22+branch%3Apost-3.1)
This repository contains the source code for the [Booting][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series. This repository contains the source code for the [Minimal Kernel][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.
[post]: https://os.phil-opp.com/booting [post]: https://os.phil-opp.com/minimal-kernel
**Check out the [master branch](https://github.com/phil-opp/blog_os) for more information.** **Check out the [master branch](https://github.com/phil-opp/blog_os) for more information.**
## Building ## Building
TODO - Install the `x86_64-unknown-none` target using rustup:
```
rustup target add x86_64-unknown-none
```
- Build by running:
```
cargo build --target x86_64-unknown-none
```
## License ## License

View File

@@ -3,9 +3,8 @@
use core::panic::PanicInfo; use core::panic::PanicInfo;
bootloader_api::entry_point!(kernel_main); #[no_mangle]
pub extern "C" fn _start() -> ! {
fn kernel_main(bootinfo: &'static mut bootloader_api::BootInfo) -> ! {
loop {} loop {}
} }