From 7e5ea00099f7afc2df997db306b5ef697bc67ab4 Mon Sep 17 00:00:00 2001
From: Dennis Kobert <dennis@kobert.dev>
Date: Thu, 24 Oct 2019 18:02:53 +0200
Subject: Restructure src files

---
 kernel/boot.asm                 |  8 --------
 kernel/linker.ld                | 16 ----------------
 kernel/multiboot_header.asm     | 15 ---------------
 kernel/src/boot.asm             |  8 ++++++++
 kernel/src/grub.cfg             |  7 +++++++
 kernel/src/linker.ld            | 16 ++++++++++++++++
 kernel/src/multiboot_header.asm | 15 +++++++++++++++
 7 files changed, 46 insertions(+), 39 deletions(-)
 delete mode 100644 kernel/boot.asm
 delete mode 100644 kernel/linker.ld
 delete mode 100644 kernel/multiboot_header.asm
 create mode 100644 kernel/src/boot.asm
 create mode 100644 kernel/src/grub.cfg
 create mode 100644 kernel/src/linker.ld
 create mode 100644 kernel/src/multiboot_header.asm

diff --git a/kernel/boot.asm b/kernel/boot.asm
deleted file mode 100644
index 839457e..0000000
--- a/kernel/boot.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-global start
-
-section .text
-bits 32
-start:
-	; print 'OK'
-	mov dword [0xb8000], 0x2f4b2f4f
-	hlt
diff --git a/kernel/linker.ld b/kernel/linker.ld
deleted file mode 100644
index cef8809..0000000
--- a/kernel/linker.ld
+++ /dev/null
@@ -1,16 +0,0 @@
-ENTRY(start)
-
-SECTIONS {
-    . = 1M;
-    
-    .boot :
-    {
-        /* ensure that the multiboot heater is at the beginning */
-        *(.multiboot_header)
-    }
-
-    .text :
-    {
-        *(.text)
-    }
-}
diff --git a/kernel/multiboot_header.asm b/kernel/multiboot_header.asm
deleted file mode 100644
index 9c9d859..0000000
--- a/kernel/multiboot_header.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-section .multiboot_header
-header_start:
-	dd 0xe85250d6				 ; magic number (multiboot 2)
-	dd 0					     ; architecture 0
-	dd header_end - header_start ; header length
-	; checksum
-	dd 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start))
-
-    ; insert optional multiboot tags here
-
-    ; required end tag
-    dw 0    ; type
-    dw 0    ; flags
-    dd 8    ; size
-header_end:
diff --git a/kernel/src/boot.asm b/kernel/src/boot.asm
new file mode 100644
index 0000000..839457e
--- /dev/null
+++ b/kernel/src/boot.asm
@@ -0,0 +1,8 @@
+global start
+
+section .text
+bits 32
+start:
+	; print 'OK'
+	mov dword [0xb8000], 0x2f4b2f4f
+	hlt
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/src/linker.ld b/kernel/src/linker.ld
new file mode 100644
index 0000000..cef8809
--- /dev/null
+++ b/kernel/src/linker.ld
@@ -0,0 +1,16 @@
+ENTRY(start)
+
+SECTIONS {
+    . = 1M;
+    
+    .boot :
+    {
+        /* ensure that the multiboot heater is at the beginning */
+        *(.multiboot_header)
+    }
+
+    .text :
+    {
+        *(.text)
+    }
+}
diff --git a/kernel/src/multiboot_header.asm b/kernel/src/multiboot_header.asm
new file mode 100644
index 0000000..9c9d859
--- /dev/null
+++ b/kernel/src/multiboot_header.asm
@@ -0,0 +1,15 @@
+section .multiboot_header
+header_start:
+	dd 0xe85250d6				 ; magic number (multiboot 2)
+	dd 0					     ; architecture 0
+	dd header_end - header_start ; header length
+	; checksum
+	dd 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start))
+
+    ; insert optional multiboot tags here
+
+    ; required end tag
+    dw 0    ; type
+    dw 0    ; flags
+    dd 8    ; size
+header_end:
-- 
cgit v1.2.3-54-g00ecf