aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarvin Borner2020-01-02 18:38:34 +0100
committerMarvin Borner2020-01-02 18:38:34 +0100
commit86f4ea797a6f6c9b988a7b055c053a618e9013bb (patch)
tree09d4dc93d65d99b4ebd625b20feaddd31303c4eb /src
parent499784a824c541001c2fd52ae95eba88dcfc952b (diff)
Switched to CMake
Still needs some polishing but it kinda works (wasn't easy though)
Diffstat (limited to 'src')
-rw-r--r--src/bootloader/test.txt1
-rw-r--r--src/kernel/boot.asm10
2 files changed, 0 insertions, 11 deletions
diff --git a/src/bootloader/test.txt b/src/bootloader/test.txt
deleted file mode 100644
index 9033296..0000000
--- a/src/bootloader/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-hallo \ No newline at end of file
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 3353a30..6b95f4c 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -26,16 +26,6 @@ section .text
hlt
jmp hlt_L
- %include "src/kernel/gdt/gdt.asm"
-
- %include "src/kernel/interrupts/idt.asm"
-
- %include "src/kernel/interrupts/isr.asm"
-
- %include "src/kernel/interrupts/irq.asm"
-
- %include "src/kernel/interact.asm"
-
global jump_userspace
jump_userspace:
cli