Changeset e3fa1720 in mainline for kernel/arch/amd64/src/boot/multiboot.S

Timestamp:

2018-11-13T20:14:30Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2214382, 64f85f5

Parents:

6ae5e3f (diff), 9a791eb9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:14:30)

git-committer:

GitHub <noreply@…> (2018-11-13 20:14:30)

Message:

Remove realmode VESA code (#59)

Enables framebuffer initialization via multiboot1(multiboot2 already did it), and removes the obsolete code. Then deduplicates code for the two multiboots.

File:

• kernel/arch/amd64/src/boot/multiboot.S (modified) (7 diffs)

kernel/arch/amd64/src/boot/multiboot.S

@@ -38 +38 @@
 #include <arch/cpu.h>
 
+// TODO: most of this file can be rewritten in C
+
+// TODO: FB state should be checked dynamically from provided multiboot info.
+//       Currently we only enable EGA statically, which forces us to rebuild
+//       the image to get very early debug output.
+
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
 
@@ -50 +56 @@
 
 .macro pm_status msg
-#ifdef CONFIG_EGA
+#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
         pushl %esi
         movl \msg, %esi
@@ -67 +73 @@
 multiboot_header:
         .long MULTIBOOT_HEADER_MAGIC
+#ifdef CONFIG_FB
         .long MULTIBOOT_HEADER_FLAGS
         .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
+#else
+        .long MULTIBOOT_HEADER_FLAGS_NOFB
+        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
+#endif
         .long multiboot_header
         .long unmapped_start
@@ -74 +85 @@
         .long 0
         .long multiboot_image_start
+#ifdef CONFIG_FB
+        .long 0
+        .long CONFIG_BFB_WIDTH
+        .long CONFIG_BFB_HEIGHT
+        .long CONFIG_BFB_BPP
+#endif
 
 SYMBOL(multiboot_image_start)
@@ -158 +175 @@
         sse2_supported:
 
-#include "vesa_prot.inc"
-
         pm2_status $status_prot2
 
@@ -568 +583 @@
 
         ret
-
-#include "vesa_real.inc"
 
 .section K_INI_PTLS, "aw", @progbits
@@ -708 +721 @@
 status_prot:
         .asciz "[prot] "
-status_vesa_copy:
-        .asciz "[vesa_copy] "
 status_multiboot_cmdline:
         .asciz "[multiboot_cmdline] "
-status_vesa_real:
-        .asciz "[vesa_real] "
 status_prot2:
         .asciz "[prot2] "