Changeset 2214382 in mainline for kernel/arch/amd64

Timestamp:

2018-11-13T20:22:20Z (7 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/arch/amd64

Files:

• _link.ld.in (modified) (1 diff)
• src/boot/multiboot.S (modified) (1 diff)
• src/boot/multiboot2.S (modified) (1 diff)

kernel/arch/amd64/_link.ld.in

@@ -11 +11 @@
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
+
+ENTRY(multiboot_image_start)
 
 SECTIONS {

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

@@ -80 +80 @@
         .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
 #endif
-        .long multiboot_header
-        .long unmapped_start
-        .long 0
-        .long 0
-        .long multiboot_image_start
+        .long 0
+        .long 0
+        .long 0
+        .long 0
+        .long 0
 #ifdef CONFIG_FB
         .long 0

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

@@ -60 +60 @@
         tag_info_req_end:
 
-        /* Address tag */
-        .align 8
-        tag_address_start:
-                .word MULTIBOOT2_TAG_ADDRESS
-                .word MULTIBOOT2_FLAGS_REQUIRED
-                .long tag_address_end - tag_address_start
-                .long multiboot2_header_start
-                .long unmapped_start
-                .long 0
-                .long 0
-        tag_address_end:
-
-        /* Entry address tag */
-        .align 8
-        tag_entry_address_start:
-                .word MULTIBOOT2_TAG_ENTRY_ADDRESS
-                .word MULTIBOOT2_FLAGS_REQUIRED
-                .long tag_entry_address_end - tag_entry_address_start
-                .long multiboot_image_start
-        tag_entry_address_end:
-
         /* Flags tag */
         .align 8