Skip to content

Commit b2d744b

Browse files
Add support for a configuration file (#326)
1 parent 78c35e4 commit b2d744b

File tree

27 files changed

+581
-219
lines changed

27 files changed

+581
-219
lines changed

Diff for: Cargo.lock

+133-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ edition = "2021"
1313
members = [
1414
"api",
1515
"common",
16+
"common/config",
1617
"uefi",
1718
"bios/boot_sector",
1819
"bios/stage-*",
@@ -36,6 +37,7 @@ repository = "https://github.com/rust-osdev/bootloader"
3637
[workspace.dependencies]
3738
bootloader_api = { version = "0.11.0", path = "api" }
3839
bootloader-x86_64-common = { version = "0.11.0", path = "common" }
40+
bootloader-boot-config = { version = "0.11.0", path = "common/config" }
3941
bootloader-x86_64-bios-common = { version = "0.11.0", path = "bios/common" }
4042

4143
[features]
@@ -52,6 +54,8 @@ fatfs = { version = "0.3.4", default-features = false, features = [
5254
tempfile = "3.3.0"
5355
mbrman = { version = "0.5.1", optional = true }
5456
gpt = { version = "3.0.0", optional = true }
57+
bootloader-boot-config = { version = "0.11.0", path = "common/config" }
58+
serde_json = "1.0.91"
5559

5660
[dev-dependencies]
5761
bootloader_test_runner = { path = "tests/runner" }
@@ -60,6 +64,7 @@ test_kernel_higher_half = { path = "tests/test_kernels/higher_half", artifact =
6064
test_kernel_map_phys_mem = { path = "tests/test_kernels/map_phys_mem", artifact = "bin", target = "x86_64-unknown-none" }
6165
test_kernel_pie = { path = "tests/test_kernels/pie", artifact = "bin", target = "x86_64-unknown-none" }
6266
test_kernel_ramdisk = { path = "tests/test_kernels/ramdisk", artifact = "bin", target = "x86_64-unknown-none" }
67+
test_kernel_config_file = { path = "tests/test_kernels/config_file", artifact = "bin", target = "x86_64-unknown-none" }
6368

6469
[profile.dev]
6570
panic = "abort"

Diff for: api/build.rs

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ fn main() {
2323
(97, 9),
2424
(106, 9),
2525
(115, 9),
26-
(124, 1),
27-
(125, 1),
28-
(126, 1),
2926
];
3027

3128
let mut code = String::new();

0 commit comments

Comments
 (0)