Skip to content

Commit

Permalink
some cleanups, remove obsolete code
Browse files Browse the repository at this point in the history
  • Loading branch information
stlankes committed Dec 21, 2019
1 parent 0c49d60 commit 5506f40
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 31 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
bootimage.bin
target
7 changes: 0 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,13 @@ version = "0.1.0"
license = "MIT/Apache-2.0"
authors = ["Stefan Lankes <slankes@eonerc.rwth-aachen.de>"]


[dependencies]
spin = "0.5.2" # Spinlocks.

[target.'cfg(target_arch = "x86_64")'.dependencies.bootloader]
version = "0.8.*"
default-features = false
optional = true

[target.'cfg(target_arch = "x86_64")'.dependencies.x86]
version = "0.28.*"
default-features = false

[features]
default = ["bootloader"]

[package.metadata.cargo-xbuild]
memcpy = true

[package.metadata.bootimage]
default-target = "x86_64-eduos.json" # This target is used if no `--target` is passed
# The command invoked on `bootimage run`
# (the "{}" will be replaced with the path to the bootable disk image)
run-command = ["qemu-system-x86_64", "-display", "none", "-smp", "1", "-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "stdio", "-drive", "format=raw,file={}"]
# Additional arguments passed to the run command for non-test executables
# Applies to `bootimage run` and `bootimage runner`
run-args = []

# The development profile, used for `cargo build`.
[profile.dev]
opt-level = 0 # controls the `--opt-level` the compiler builds with
Expand Down
3 changes: 1 addition & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ pub mod macros;
pub mod logging;
pub mod arch;
pub mod console;
#[cfg(not(feature = "bootloader"))]
pub mod rlib;
pub mod rlib;

0 comments on commit 5506f40

Please sign in to comment.