Changeset 8be3230 in mainline for kernel/arch


Ignore:
Timestamp:
2018-11-18T01:01:02Z (7 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.

Location:
kernel/arch
Files:
8 added
2 edited

Legend:

Unmodified
Added
Removed

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

    rec18e454 r8be3230  
    3838#include <arch/cpu.h>
    3939
    40 // TODO: most of this file can be rewritten in C
    41 
    4240#define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
    4341
    … …  
    5250
    5351.macro pm_status msg
    54 #if defined(CONFIG_EGA) && !defined(CONFIG_FB)
     52#ifdef CONFIG_EGA
    5553        pushl %esi
    5654        movl \msg, %esi
    … …  
    6967multiboot_header:
    7068        .long MULTIBOOT_HEADER_MAGIC
    71 #ifdef CONFIG_FB
    7269        .long MULTIBOOT_HEADER_FLAGS
    7370        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
    74 #else
    75         .long MULTIBOOT_HEADER_FLAGS_NOFB
    76         .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
    77 #endif
    7871        .long multiboot_header
    7972        .long unmapped_start
    … …  
    8174        .long 0
    8275        .long multiboot_image_start
    83 #ifdef CONFIG_FB
    84         .long 0
    85         .long CONFIG_BFB_WIDTH
    86         .long CONFIG_BFB_HEIGHT
    87         .long CONFIG_BFB_BPP
    88 #endif
    8976
    9077SYMBOL(multiboot_image_start)
    … …  
    171158        sse2_supported:
    172159
     160#include "vesa_prot.inc"
     161
    173162        pm2_status $status_prot2
    174163
    … …  
    579568
    580569        ret
     570
     571#include "vesa_real.inc"
    581572
    582573.section K_INI_PTLS, "aw", @progbits
    … …  
    717708status_prot:
    718709        .asciz "[prot] "
     710status_vesa_copy:
     711        .asciz "[vesa_copy] "
    719712status_multiboot_cmdline:
    720713        .asciz "[multiboot_cmdline] "
     714status_vesa_real:
     715        .asciz "[vesa_real] "
    721716status_prot2:
    722717        .asciz "[prot2] "

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

    rec18e454 r8be3230  
    3838#include <arch/cpu.h>
    3939
    40 // TODO: most of this file can be rewritten in C
    41 
    4240#define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
    4341
    … …  
    5250
    5351.macro pm_status msg
    54 #if defined(CONFIG_EGA) && !defined(CONFIG_FB)
     52#ifdef CONFIG_EGA
    5553        pushl %esi
    5654        movl \msg, %esi
    … …  
    6866multiboot_header:
    6967        .long MULTIBOOT_HEADER_MAGIC
    70 #ifdef CONFIG_FB
    7168        .long MULTIBOOT_HEADER_FLAGS
    7269        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)  /* checksum */
    73 #else
    74         .long MULTIBOOT_HEADER_FLAGS_NOFB
    75         .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
    76 #endif
    7770        .long multiboot_header
    7871        .long unmapped_start
    … …  
    8073        .long 0
    8174        .long multiboot_image_start
    82 #ifdef CONFIG_FB
    83         .long 0
    84         .long CONFIG_BFB_WIDTH
    85         .long CONFIG_BFB_HEIGHT
    86         .long CONFIG_BFB_BPP
    87 #endif
    8875
    8976SYMBOL(multiboot_image_start)
    … …  
    117104
    118105        pm_status $status_prot
     106
     107#include "vesa_prot.inc"
    119108
    120109#ifndef PROCESSOR_i486
    … …  
    696685        ret
    697686
     687#include "vesa_real.inc"
     688
    698689.section K_DATA_START, "aw", @progbits
    699690
    … …  
    729720status_non_pse:
    730721        .asciz "[non_pse] "
     722status_vesa_copy:
     723        .asciz "[vesa_copy] "
    731724status_multiboot_cmdline:
    732725        .asciz "[multiboot_cmdline] "
     726status_vesa_real:
     727        .asciz "[vesa_real] "
    733728status_prot2:
    734729        .asciz "[prot2] "
Note: See TracChangeset for help on using the changeset viewer.