Skip to content

Commit

Permalink
Tests: Update to bootloader 0.6.4 and update Cargo.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
phil-opp committed Jul 18, 2019
1 parent e9fb5c2 commit a718354
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 40 deletions.
2 changes: 1 addition & 1 deletion Readme.md
Expand Up @@ -16,7 +16,7 @@ First you need to add a dependency on the [`bootloader`](https://github.com/rust
# in your Cargo.toml

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
```

**Note**: At least bootloader version `0.5.1` is required since `bootimage 0.7.0`. For earlier bootloader versions, use `bootimage 0.6.6`.
Expand Down
70 changes: 38 additions & 32 deletions example-kernels/Cargo.lock

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

2 changes: 1 addition & 1 deletion example-kernels/basic/Cargo.toml
Expand Up @@ -5,5 +5,5 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
x86_64 = "0.5.3"
2 changes: 1 addition & 1 deletion example-kernels/default-target-bootimage/Cargo.toml
Expand Up @@ -5,7 +5,7 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
x86_64 = "0.5.3"

[package.metadata.bootimage]
Expand Down
2 changes: 1 addition & 1 deletion example-kernels/default-target-cargo/Cargo.toml
Expand Up @@ -5,5 +5,5 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
x86_64 = "0.5.3"
2 changes: 1 addition & 1 deletion example-kernels/runner-test/Cargo.toml
Expand Up @@ -9,7 +9,7 @@ name = "no-harness"
harness = false

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
x86_64 = "0.5.3"

[package.metadata.bootimage]
Expand Down
2 changes: 1 addition & 1 deletion example-kernels/runner/Cargo.toml
Expand Up @@ -5,7 +5,7 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
x86_64 = "0.5.3"

[package.metadata.bootimage]
Expand Down
2 changes: 1 addition & 1 deletion example-kernels/testing-qemu-exit-code/Cargo.toml
Expand Up @@ -5,7 +5,7 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
x86_64 = "0.5.3"

[package.metadata.bootimage]
Expand Down
2 changes: 1 addition & 1 deletion example-kernels/testing-serial-result/Cargo.toml
Expand Up @@ -5,7 +5,7 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"

[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.4"
x86_64 = "0.5.3"
spin = "0.4.9"
uart_16550 = "0.1.0"
Expand Down

0 comments on commit a718354

Please sign in to comment.