Changeset 8be3230 in mainline for kernel/arch/ia32/src/boot/multiboot.S

Timestamp:

2018-11-18T01:01:02Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3b3fcf36

Parents:

ec18e454

Message:

Revert "Remove realmode VESA code" - needs more work

This reverts commit 8781e9d05ac3f6aeaa3ad709c5af9efa3209b87a.

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)
 
@@ -52 +50 @@
 
 .macro pm_status msg
-#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
+#ifdef CONFIG_EGA
         pushl %esi
         movl \msg, %esi
@@ -68 +66 @@
 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
@@ -80 +73 @@
         .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)
@@ -117 +104 @@
 
         pm_status $status_prot
+
+#include "vesa_prot.inc"
 
 #ifndef PROCESSOR_i486
@@ -696 +685 @@
         ret
 
+#include "vesa_real.inc"
+
 .section K_DATA_START, "aw", @progbits
 
@@ -729 +720 @@
 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] "