Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build on latest Rust nightly #162

Merged
merged 2 commits into from
May 14, 2021
Merged

Fix build on latest Rust nightly #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b295a62
Update uefi crate to v0.9.0
phil-opp May 14, 2021
a9b47f1
Update changelog
phil-opp May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ x86_64 = { version = "0.13.2", optional = true, default-features = false, featur
usize_conversions = { version = "0.2.0", optional = true }
bit_field = { version = "0.10.0", optional = true }
log = { version = "0.4.8", optional = true }
uefi = { version = "0.7.0", optional = true }
uefi = { version = "0.9.0", optional = true }
argh = { version = "0.1.3", optional = true }
displaydoc = { version = "0.1.7", optional = true }
conquer-once = { version = "0.2.1", optional = true, default-features = false }
Expand Down
2 changes: 2 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

- Fix build on latest Rust nightly by updating to `uefi` v0.9.0 ([#162](https://github.com/rust-osdev/bootloader/pull/162))

# 0.10.3 – 2021-05-05

- Change register used in setting SS in stage_4 ([#156](https://github.com/rust-osdev/bootloader/pull/156))
Expand Down
4 changes: 2 additions & 2 deletions src/bin/uefi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ fn init_logger(st: &SystemTable<Boot>) -> (PhysAddr, FrameBufferInfo) {
horizontal_resolution: mode_info.resolution().0,
vertical_resolution: mode_info.resolution().1,
pixel_format: match mode_info.pixel_format() {
PixelFormat::RGB => bootloader::boot_info::PixelFormat::BGR,
PixelFormat::BGR => bootloader::boot_info::PixelFormat::BGR,
PixelFormat::Rgb => bootloader::boot_info::PixelFormat::BGR,
PixelFormat::Bgr => bootloader::boot_info::PixelFormat::BGR,
PixelFormat::Bitmask | PixelFormat::BltOnly => {
panic!("Bitmask and BltOnly framebuffers are not supported")
}
Expand Down