summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authornatrixaeria <upezu@student.kit.edu>2019-10-24 17:32:34 +0200
committernatrixaeria <upezu@student.kit.edu>2019-10-24 17:32:34 +0200
commit2106724907a306897fe846a0efabed09c8850bce (patch)
tree92e3f07ad50184065e3defdee7f9073a402a3b81 /kernel
parent756408c5a9d5fad16a26caaaad791f53833a46d9 (diff)
parent0e2f1e5bb4223b91e08cdc25284f1e87e1e57207 (diff)
Merge branch 'master' of dennis:/var/repos/uff-os
Diffstat (limited to 'kernel')
-rw-r--r--kernel/.gitignore1
-rw-r--r--kernel/linker.ld16
2 files changed, 17 insertions, 0 deletions
diff --git a/kernel/.gitignore b/kernel/.gitignore
new file mode 100644
index 0000000..2f7896d
--- /dev/null
+++ b/kernel/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/kernel/linker.ld b/kernel/linker.ld
new file mode 100644
index 0000000..cef8809
--- /dev/null
+++ b/kernel/linker.ld
@@ -0,0 +1,16 @@
+ENTRY(start)
+
+SECTIONS {
+ . = 1M;
+
+ .boot :
+ {
+ /* ensure that the multiboot heater is at the beginning */
+ *(.multiboot_header)
+ }
+
+ .text :
+ {
+ *(.text)
+ }
+}