From 00e9f2ce4653649444d00cad7a100fdc5d47e1cb Mon Sep 17 00:00:00 2001 From: mintsuki Date: Tue, 27 Sep 2022 05:55:00 +0200 Subject: [PATCH] multiboot: Fix warnings when building BIOS port --- common/protos/multiboot1.c | 2 ++ common/protos/multiboot2.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/common/protos/multiboot1.c b/common/protos/multiboot1.c index c06e8578..16b86acc 100644 --- a/common/protos/multiboot1.c +++ b/common/protos/multiboot1.c @@ -377,7 +377,9 @@ noreturn void multiboot1_load(char *config, char *cmdline) { multiboot1_info->flags |= (1 << 12); +#if defined (UEFI) skip_modeset:; +#endif } else { #if defined (UEFI) panic(true, "multiboot1: Cannot use text mode with UEFI."); diff --git a/common/protos/multiboot2.c b/common/protos/multiboot2.c index 18fd0be1..b3edf4a3 100644 --- a/common/protos/multiboot2.c +++ b/common/protos/multiboot2.c @@ -109,7 +109,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) { bool is_elf_info_requested = false; +#if defined (UEFI) bool is_framebuffer_required = false; +#endif uint64_t entry_point = 0xffffffff; @@ -147,7 +149,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) { #endif break; case MULTIBOOT_TAG_TYPE_FRAMEBUFFER: + #if defined (UEFI) is_framebuffer_required = is_required; + #endif break; case MULTIBOOT_TAG_TYPE_ACPI_NEW: is_new_acpi_required = is_required; @@ -586,7 +590,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) { append_tag(info_idx, &tag->common); +#if defined (UEFI) skip_modeset:; +#endif } //////////////////////////////////////////////