Changeset 2214382 in mainline


Ignore:
Timestamp:
2018-11-13T20:22:20Z (5 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Children:
6e5252a
Parents:
e3fa1720
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-23 13:44:26)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:22:20)
Message:

Fix x86 linker scripts and make multiboot load using ELF metadata

Location:
kernel
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/amd64/_link.ld.in

    re3fa1720 r2214382  
    1111#include <arch/boot/boot.h>
    1212#include <arch/mm/page.h>
     13
     14ENTRY(multiboot_image_start)
    1315
    1416SECTIONS {

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

    re3fa1720 r2214382  
    8080        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
    8181#endif
    82         .long multiboot_header
    83         .long unmapped_start
    84         .long 0
    85         .long 0
    86         .long multiboot_image_start
     82        .long 0
     83        .long 0
     84        .long 0
     85        .long 0
     86        .long 0
    8787#ifdef CONFIG_FB
    8888        .long 0

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

    re3fa1720 r2214382  
    6060        tag_info_req_end:
    6161
    62         /* Address tag */
    63         .align 8
    64         tag_address_start:
    65                 .word MULTIBOOT2_TAG_ADDRESS
    66                 .word MULTIBOOT2_FLAGS_REQUIRED
    67                 .long tag_address_end - tag_address_start
    68                 .long multiboot2_header_start
    69                 .long unmapped_start
    70                 .long 0
    71                 .long 0
    72         tag_address_end:
    73 
    74         /* Entry address tag */
    75         .align 8
    76         tag_entry_address_start:
    77                 .word MULTIBOOT2_TAG_ENTRY_ADDRESS
    78                 .word MULTIBOOT2_FLAGS_REQUIRED
    79                 .long tag_entry_address_end - tag_entry_address_start
    80                 .long multiboot_image_start
    81         tag_entry_address_end:
    82 
    8362        /* Flags tag */
    8463        .align 8

  • kernel/arch/ia32/_link.ld.in

    re3fa1720 r2214382  
    1111#include <arch/boot/boot.h>
    1212#include <arch/mm/page.h>
     13
     14ENTRY(multiboot_image_start)
    1315
    1416SECTIONS {

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

    re3fa1720 r2214382  
    7474        .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
    7575#endif
    76         .long multiboot_header
    77         .long unmapped_start
    78         .long 0
    79         .long 0
    80         .long multiboot_image_start
     76        .long 0
     77        .long 0
     78        .long 0
     79        .long 0
     80        .long 0
    8181#ifdef CONFIG_FB
    8282        .long 0

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

    re3fa1720 r2214382  
    5858        tag_info_req_end:
    5959
    60         /* Address tag */
    61         .align 8
    62         tag_address_start:
    63                 .word MULTIBOOT2_TAG_ADDRESS
    64                 .word MULTIBOOT2_FLAGS_REQUIRED
    65                 .long tag_address_end - tag_address_start
    66                 .long multiboot2_header_start
    67                 .long unmapped_start
    68                 .long 0
    69                 .long 0
    70         tag_address_end:
    71 
    72         /* Entry address tag */
    73         .align 8
    74         tag_entry_address_start:
    75                 .word MULTIBOOT2_TAG_ENTRY_ADDRESS
    76                 .word MULTIBOOT2_FLAGS_REQUIRED
    77                 .long tag_entry_address_end - tag_entry_address_start
    78                 .long multiboot_image_start
    79         tag_entry_address_end:
    80 
    8160        /* Flags tag */
    8261        .align 8

  • kernel/genarch/include/genarch/multiboot/multiboot.h

    re3fa1720 r2214382  
    4040
    4141#define MULTIBOOT_HEADER_MAGIC       0x1badb002
    42 #define MULTIBOOT_HEADER_FLAGS       0x00010007
    43 #define MULTIBOOT_HEADER_FLAGS_NOFB  0x00010003
     42#define MULTIBOOT_HEADER_FLAGS       0x00000007
     43#define MULTIBOOT_HEADER_FLAGS_NOFB  0x00000003
    4444
    4545#define MULTIBOOT_LOADER_MAGIC  0x2badb002
Note: See TracChangeset for help on using the changeset viewer.