diff --git a/src/kernel/boot/multiboot_header.S b/src/kernel/boot/multiboot_header.S index 527b894..ab80287 100644 --- a/src/kernel/boot/multiboot_header.S +++ b/src/kernel/boot/multiboot_header.S @@ -1,14 +1,8 @@ #include .section .multiboot -.align 0x4 -MultibootHeader1: -.long MBOOT1_MAGIC -.long MBOOT1_FLAGS -.long MBOOT1_CS - .align 0x8 -MultibootHeader2: +Multiboot2Header: .long MBOOT2_MAGIC .long MBOOT2_ARCH .long MBOOT2_LENGTH @@ -17,4 +11,4 @@ MultibootHeader2: .short 0 .short 0 .long 8 -MultibootHeader2End: +Multiboot2HeaderEnd: diff --git a/src/kernel/include/multiboot.h b/src/kernel/include/multiboot.h index 35fe12c..9964bd1 100644 --- a/src/kernel/include/multiboot.h +++ b/src/kernel/include/multiboot.h @@ -1,12 +1,7 @@ #pragma once -#define MBOOT1_MAGIC 0x1BADB002 -#define MBOOT1_REPLY 0x2BADB002 -#define MBOOT1_FLAGS 0 -#define MBOOT1_CS -(MBOOT1_FLAGS + MBOOT1_MAGIC) - #define MBOOT2_MAGIC 0xE85250D6 #define MBOOT2_REPLY 0x36D76289 #define MBOOT2_ARCH 0 -#define MBOOT2_LENGTH (MultibootHeader2End - MultibootHeader2) +#define MBOOT2_LENGTH (Multiboot2HeaderEnd - Multiboot2Header) #define MBOOT2_CHECKSUM -(MBOOT2_MAGIC + MBOOT2_ARCH + MBOOT2_LENGTH) diff --git a/toolchain/mkiso b/toolchain/mkiso index b5c232d..11d8a97 100755 --- a/toolchain/mkiso +++ b/toolchain/mkiso @@ -15,9 +15,6 @@ set default=0 menuentry "mittos64" { multiboot2 /kernel } -menuentry "mittos64 multiboot1" { - multiboot /kernel -} EOF