Changeset 8781e9d in mainline for kernel/arch/amd64/src/boot/multiboot.S
- Timestamp:
- 2018-11-12T20:20:36Z (5 years ago)
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/amd64/src/boot/multiboot.S
r15639ec r8781e9d 38 38 #include <arch/cpu.h> 39 39 40 // TODO: most of this file can be rewritten in C 41 40 42 #define START_STACK (BOOT_OFFSET - BOOT_STACK_SIZE) 41 43 … … 50 52 51 53 .macro pm_status msg 52 #if def CONFIG_EGA54 #if defined(CONFIG_EGA) && !defined(CONFIG_FB) 53 55 pushl %esi 54 56 movl \msg, %esi … … 67 69 multiboot_header: 68 70 .long MULTIBOOT_HEADER_MAGIC 71 #ifdef CONFIG_FB 69 72 .long MULTIBOOT_HEADER_FLAGS 70 73 .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 71 78 .long multiboot_header 72 79 .long unmapped_start … … 74 81 .long 0 75 82 .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 76 89 77 90 SYMBOL(multiboot_image_start) … … 158 171 sse2_supported: 159 172 160 #include "vesa_prot.inc"161 162 173 pm2_status $status_prot2 163 174 … … 568 579 569 580 ret 570 571 #include "vesa_real.inc"572 581 573 582 .section K_INI_PTLS, "aw", @progbits … … 708 717 status_prot: 709 718 .asciz "[prot] " 710 status_vesa_copy:711 .asciz "[vesa_copy] "712 719 status_multiboot_cmdline: 713 720 .asciz "[multiboot_cmdline] " 714 status_vesa_real:715 .asciz "[vesa_real] "716 721 status_prot2: 717 722 .asciz "[prot2] "
Note:
See TracChangeset
for help on using the changeset viewer.