Changeset 6e5252a in mainline for kernel/arch/amd64/src/boot

Timestamp:

2018-11-13T20:22:20Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

156bae23

Parents:

2214382

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-23 21:48:41)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:22:20)

Message:

Place AP bootstrap correctly via linker script instead of manual copy

Location:

kernel/arch/amd64/src/boot

Files:

• multiboot.S (modified) (2 diffs)
• multiboot2.S (modified) (1 diff)

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

@@ -46 +46 @@
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
 
-.section K_TEXT_START, "ax"
-
-.code32
-
-.macro pm_error msg
-        movl \msg, %esi
-        jmp pm_error_halt
-.endm
-
-.macro pm_status msg
-#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
-        pushl %esi
-        movl \msg, %esi
-        call pm_early_puts
-        popl %esi
-#endif
-.endm
-
-.macro pm2_status msg
-#ifndef CONFIG_FB
-        pm_status \msg
-#endif
-.endm
+.section .multiboot, "a"
 
 .align 4
@@ -91 +69 @@
         .long CONFIG_BFB_BPP
 #endif
+
+.section K_TEXT_START, "ax"
+
+.code32
+
+.macro pm_error msg
+        movl \msg, %esi
+        jmp pm_error_halt
+.endm
+
+.macro pm_status msg
+#if defined(CONFIG_EGA) && !defined(CONFIG_FB)
+        pushl %esi
+        movl \msg, %esi
+        call pm_early_puts
+        popl %esi
+#endif
+.endm
+
+.macro pm2_status msg
+#ifndef CONFIG_FB
+        pm_status \msg
+#endif
+.endm
 
 SYMBOL(multiboot_image_start)

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

@@ -35 +35 @@
 #include <genarch/multiboot/multiboot2.h>
 
-.section K_TEXT_START, "ax"
-
-.code32
+.section .multiboot, "a"
 
 .align 8