From 9cb2959a7749295c78431e8b80d954318e921232 Mon Sep 17 00:00:00 2001
From: nub31 <oliverlhs@outlook.com>
Date: Sat, 23 Aug 2025 19:21:41 +0200
Subject: [PATCH] ...

---
 grub.cfg     |  2 +-
 src/boot.asm | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/grub.cfg b/grub.cfg
index 36868e9..edb10eb 100644
--- a/grub.cfg
+++ b/grub.cfg
@@ -1,3 +1,3 @@
 menuentry "nub-os" {
-    multiboot /boot/kernel.bin
+    multiboot2 /boot/kernel.bin
 }
diff --git a/src/boot.asm b/src/boot.asm
index c557ab3..0695acb 100644
--- a/src/boot.asm
+++ b/src/boot.asm
@@ -1,14 +1,20 @@
 extern kernel_main
 
-%define MAGIC       0x1BADB002
-%define FLAGS       0x0
-%define CHECKSUM    -(MAGIC + FLAGS)
+%define MAGIC       0xe85250d6
+%define ARCH        0
+%define LEN         (header_end - header_start)
+%define CHECKSUM    -(MAGIC + ARCH + LEN)
 
 section .multiboot
-align 4
+header_start:
+align 8
     dd MAGIC
-    dd FLAGS
+    dd ARCH
+    dd LEN
     dd CHECKSUM
+    dw 0
+    dd 8
+header_end:
 
 section .bss
 align 16