:: commit ac201cdada44465b279f15e6c924bdd6481bbbd4

mintsuki <mintsuki@protonmail.com> — 2022-09-27 03:55

parents: 7daa95b7d2

multiboot: Fix warnings when building BIOS port

diff --git a/common/protos/multiboot1.c b/common/protos/multiboot1.c
index 69938773..4a5c76a3 100644
--- a/common/protos/multiboot1.c
+++ b/common/protos/multiboot1.c
@@ -372,7 +372,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 10ec22af..8e05cc7f 100644
--- a/common/protos/multiboot2.c
+++ b/common/protos/multiboot2.c
@@ -107,7 +107,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;
 
@@ -145,7 +147,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;
@@ -581,7 +585,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
 
         append_tag(info_idx, &tag->common);
 
+#if defined (UEFI)
 skip_modeset:;
+#endif
     }
 
     //////////////////////////////////////////////
tab: 248 wrap: offon