summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/src/boot.asm (renamed from kernel/boot.asm)0
-rw-r--r--kernel/src/grub.cfg7
-rw-r--r--kernel/src/linker.ld (renamed from kernel/linker.ld)0
-rw-r--r--kernel/src/multiboot_header.asm (renamed from kernel/multiboot_header.asm)0
4 files changed, 7 insertions, 0 deletions
diff --git a/kernel/boot.asm b/kernel/src/boot.asm
index 839457e..839457e 100644
--- a/kernel/boot.asm
+++ b/kernel/src/boot.asm
diff --git a/kernel/src/grub.cfg b/kernel/src/grub.cfg
new file mode 100644
index 0000000..ba8f8e8
--- /dev/null
+++ b/kernel/src/grub.cfg
@@ -0,0 +1,7 @@
+set timeout=0
+set default=0
+
+menuentry "uff-os" {
+ multiboot2 /boot/kernel.bin
+ boot
+}
diff --git a/kernel/linker.ld b/kernel/src/linker.ld
index cef8809..cef8809 100644
--- a/kernel/linker.ld
+++ b/kernel/src/linker.ld
diff --git a/kernel/multiboot_header.asm b/kernel/src/multiboot_header.asm
index 9c9d859..9c9d859 100644
--- a/kernel/multiboot_header.asm
+++ b/kernel/src/multiboot_header.asm