Changeset 8781e9d in mainline for kernel/arch/ia32/src/boot/multiboot.S

Timestamp:

2018-11-12T20:20:36Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

08f1a6d

Parents:

15639ec

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-12 20:09:40)

git-committer:

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

Message:

Remove realmode VESA code

This simply enables framebuffer setup via multiboot1
(multiboot2 already did it), and removes the obsolete code.

File:

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

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

@@ -38 +38 @@
 #include <arch/cpu.h>
 
+// TODO: most of this file can be rewritten in C
+
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
 
@@ -50 +52 @@
 
 .macro pm_status msg
-#ifdef CONFIG_EGA
+#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
         pushl %esi
         movl \msg, %esi
@@ -66 +68 @@
 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
@@ -73 +80 @@
         .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)
@@ -104 +117 @@
 
         pm_status $status_prot
-
-#include "vesa_prot.inc"
 
 #ifndef PROCESSOR_i486
@@ -685 +696 @@
         ret
 
-#include "vesa_real.inc"
-
 .section K_DATA_START, "aw", @progbits
 
@@ -720 +729 @@
 status_non_pse:
         .asciz "[non_pse] "
-status_vesa_copy:
-        .asciz "[vesa_copy] "
 status_multiboot_cmdline:
         .asciz "[multiboot_cmdline] "
-status_vesa_real:
-        .asciz "[vesa_real] "
 status_prot2:
         .asciz "[prot2] "