From 0936f4d7b781ca8342fa80037d836306913aa282 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 28 Sep 2019 23:09:13 +0200
Subject: Switched back to normal aligned kernel

I had some problems with paging but maybe I will revert again later
---
 src/kernel/linker.ld | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'src/kernel/linker.ld')

diff --git a/src/kernel/linker.ld b/src/kernel/linker.ld
index 3e209fc..2f74866 100644
--- a/src/kernel/linker.ld
+++ b/src/kernel/linker.ld
@@ -1,24 +1,25 @@
+OUTPUT_FORMAT("binary")
 ENTRY(start)
-OUTPUT_FORMAT(elf32-i386)
-
-SECTIONS {
-   . = 0xC0100000;
- 
-   .text : AT(ADDR(.text) - 0xC0000000) {
-       *(.text)
-       *(.rodata*)
-   }
- 
-   .data ALIGN (0x1000) : AT(ADDR(.data) - 0xC0000000) {
-       *(.data)
-   }
- 
-   .bss : AT(ADDR(.bss) - 0xC0000000) {
-       _sbss = .;
-       *(COMMON)
-       *(.bss)
-       _ebss = .;
-   }
-
-   end = .;
+phys = 0x00100000;
+SECTIONS
+{
+  .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 = .;
 }
\ No newline at end of file
-- 
cgit v1.2.3