improve linking of initial boot code

2 files changed, 8 insertions, 18 deletions

diff --git a/boot.S b/boot.S
index a792c94..ae56387 100644
--- a/boot.S
+++ b/boot.S
@@ -1,20 +1,14 @@
 // armv7 mode
  
-// To keep this in the first portion of the binary.
-.section ".boot"
-
-//.org 0x8000
-	
-// Make _start global.
-.globl _start
- 
 // Entry point for the kernel.
 // r15 -> should begin execution at 0x8000.
 // r0 -> 0x00000000
 // r1 -> 0x00000C42
 // r2 -> 0x00000100 - start of ATAGS
 // preserve these registers as argument for kernel_main
-_start:
+	
+.globl _boot // make entry point label global
+_boot:
         // Shut off extra cores
         mrc p15, 0, r5, c0, c0, 5
         and r5, r5, #3
diff --git a/linker.ld b/linker.ld
index 5bdbfd2..a0ad1ae 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1,4 +1,4 @@
-ENTRY(_start) /* defined in boot.S */
+ENTRY(_boot) /* defined in boot.S; qemu needs it to run elf file */
  
 SECTIONS
 {
@@ -15,20 +15,16 @@ SECTIONS
 
     . = 0x8000;
 
-    /* For AArch64, use . = 0x80000 */
+    /* RPi in 64-bit mode uses address 0x80000 instead */
     
     __start = .;
-    .boot :
-    {
-	boot.o
-    }
-    __kernel_start = .;
     .kernel :
     {
+        __kernel_start = .;
+	KEEP(boot.o)
 	*(EXCLUDE_FILE (libkernel.o interrupt_vector.o interrupts.o) *)
+	__kernel_end = .;
     }
-    . = ALIGN(4096); /* align to page size */
-    __kernel_end = .;
     __kernel_size = __kernel_end - __kernel_start;