Merge pull request rust-osdev#43 from rust-osdev/binary-feature

phil-opp · web-flow · commit bffeb835121c · 2019-07-19T11:01:50.000+02:00
If the bootloader has a feature named `binary`, enable it
diff --git a/Readme.md b/Readme.md
@@ -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`.
diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock
diff --git a/example-kernels/basic/Cargo.toml b/example-kernels/basic/Cargo.toml
@@ -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"
diff --git a/example-kernels/default-target-bootimage/Cargo.toml b/example-kernels/default-target-bootimage/Cargo.toml
@@ -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]
diff --git a/example-kernels/default-target-cargo/Cargo.toml b/example-kernels/default-target-cargo/Cargo.toml
@@ -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"
diff --git a/example-kernels/runner-test/Cargo.toml b/example-kernels/runner-test/Cargo.toml
@@ -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]
diff --git a/example-kernels/runner/Cargo.toml b/example-kernels/runner/Cargo.toml
@@ -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]
diff --git a/example-kernels/testing-qemu-exit-code/Cargo.toml b/example-kernels/testing-qemu-exit-code/Cargo.toml
@@ -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]
diff --git a/example-kernels/testing-serial-result/Cargo.toml b/example-kernels/testing-serial-result/Cargo.toml
@@ -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"
diff --git a/src/builder.rs b/src/builder.rs
