Skip to content

Commit

Permalink
Remove UEFI deps
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Schaefer <[email protected]>
  • Loading branch information
JohnAZoidberg committed Jul 21, 2024
1 parent d834b37 commit b206db3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ default-members = [
"framework_tool",
]

[patch.crates-io]
uefi = { git = "https://github.com/FrameworkComputer/uefi-rs", branch = "merged" }
uefi-services = { git = "https://github.com/FrameworkComputer/uefi-rs", branch = "merged" }
#[patch.crates-io]
#uefi = { git = "https://github.com/FrameworkComputer/uefi-rs", branch = "merged" }
#uefi-services = { git = "https://github.com/FrameworkComputer/uefi-rs", branch = "merged" }

[profile.release]
lto = true
19 changes: 10 additions & 9 deletions framework_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ linux = ["linux_pio", "unix"]
windows = ["std", "smbios", "dep:windows", "win_driver"]
smbios = ["dep:smbios-lib"]
std = ["dep:clap", "dep:clap-verbosity-flag", "dep:env_logger", "smbios-lib?/std", "dep:hidapi", "dep:rusb"]
uefi = [
"dep:plain", "raw_pio", "smbios", "lazy_static/spin_no_std", "dep:uefi", "dep:uefi-services",
# Otherwise I get: `LLVM ERROR: Do not know how to split the result of this operator!`
# Seems to be a Ruset/LLVM bug when SSE is enabled.
# See: https://github.com/rust-lang/rust/issues/61721
"sha2/force-soft"
]
uefi = []
#uefi = [
# "dep:plain", "raw_pio", "smbios", "lazy_static/spin_no_std", "dep:uefi", "dep:uefi-services",
# # Otherwise I get: `LLVM ERROR: Do not know how to split the result of this operator!`
# # Seems to be a Ruset/LLVM bug when SSE is enabled.
# # See: https://github.com/rust-lang/rust/issues/61721
# "sha2/force-soft"
#]

# EC communication via Port I/O on Linux
linux_pio = ["dep:libc"]
Expand Down Expand Up @@ -49,8 +50,8 @@ num-derive = { version = "0.3", default-features = false }
num-traits = { version = "0.2", default-features = false }
env_logger = { version = "0.10.0", optional = true }
log = { version = "0.4", default-features = true }
uefi = { version = "0.20", features = ["alloc"], optional = true }
uefi-services = { version = "0.17", optional = true }
#uefi = { version = "0.20", features = ["alloc"], optional = true }
#uefi-services = { version = "0.17", optional = true }
plain = { version = "0.2.3", optional = true }
spin = { version = "0.9.4", optional = false }
hidapi = { version = "2.1.0", optional = true }
Expand Down

0 comments on commit b206db3

Please sign in to comment.