Fixed linker

2 files changed, 23 insertions, 74 deletions

diff --git a/src/boot.s b/src/boot.s
deleted file mode 100644
index 6cb2f7c..0000000
--- a/src/boot.s
+++ /dev/null
@@ -1,41 +0,0 @@
-// Constants for the multiboot header
-.set ALIGN, 1<<0
-.set MEMINFO, 1<<1
-.set FLAGS, ALIGN | MEMINFO
-.set MAGIC, 0x1BADB002
-.set CHECKSUM, -(MAGIC + FLAGS)
-
-// Header marking the program as kernel
-.section .multiboot
-.align 4
-.long MAGIC
-.long FLAGS
-.long CHECKSUM
-
-// Initialize a small stack
-.section .bss
-.align 16
-stack_bottom:
-.skip 16384 // 16 KiB
-stack_top:
-
-// Use _start from linker as starting point
-.section .text
-.global _start
-.type _start, @function
-_start:
-	// Set up stack by setting esp to top of stack
-	mov $stack_top, %esp
-
-	// TODO: Initialize processor, load GDT, enable paging
-
-	// Call the kernel
-	call kernel_main
-
-	// Put the system in an infinite loop
-	cli
-1:	hlt
-	jmp 1b
-
-// Set the size of the _start symbol to the current location '.' minus its start
-.size _start, . - _start
diff --git a/src/linker.ld b/src/linker.ld
index 10315a5..6461b2b 100644
--- a/src/linker.ld
+++ b/src/linker.ld
@@ -1,35 +1,25 @@
-/* Specify entry for bootloader */
-ENTRY(_start)
- 
-/* Specify position of object files in kernel image */
+OUTPUT_FORMAT("binary")
+ENTRY(start)
+phys = 0x00100000;
 SECTIONS
 {
-	/* Start at 1MiB */
-	. = 1M;
- 
-	/* First multiboot header then text section */
-	.text BLOCK(4K) : ALIGN(4K)
-	{
-		*(.multiboot)
-		*(.text)
-	}
- 
-	/* Read-only data */
-	.rodata BLOCK(4K) : ALIGN(4K)
-	{
-		*(.rodata)
-	}
- 
-	/* Read-write data (initialized) */
-	.data BLOCK(4K) : ALIGN(4K)
-	{
-		*(.data)
-	}
- 
-	/* Read-write data (uninitialized) and stack */
-	.bss BLOCK(4K) : ALIGN(4K)
-	{
-		*(COMMON)
-		*(.bss)
-	}
-}
\ No newline at end of file
+  .text phys : AT(phys) {
+    code = .;
+    *(.text)
+    *(.rodata*)
+    . = ALIGN(4096);
+  }
+  .data : AT(phys + (data - code))
+  {
+    data = .;
+    *(.data)
+    . = ALIGN(4096);
+  }
+  .bss : AT(phys + (bss - code))
+  {
+    bss = .;
+    *(.bss)
+    . = ALIGN(4096);
+  }
+  end = .;
+}