thomas/mittos64
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove Multiboot1 support

Browse Source
This commit is contained in:
Thomas Lovén 2017-12-07 22:47:52 +01:00
parent 05efb98b06
commit 2451851b9f
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/boot/multiboot_header.S
View File

@ -1,14 +1,8 @@
#include <multiboot.h> #include <multiboot.h>
.section .multiboot .section .multiboot
.align 0x4
MultibootHeader1:
.long MBOOT1_MAGIC
.long MBOOT1_FLAGS
.long MBOOT1_CS
.align 0x8 .align 0x8
MultibootHeader2: Multiboot2Header:
.long MBOOT2_MAGIC .long MBOOT2_MAGIC
.long MBOOT2_ARCH .long MBOOT2_ARCH
.long MBOOT2_LENGTH .long MBOOT2_LENGTH
@ -17,4 +11,4 @@ MultibootHeader2:
.short 0 .short 0
.short 0 .short 0
.long 8 .long 8
MultibootHeader2End: Multiboot2HeaderEnd:

7
src/kernel/include/multiboot.h
View File

@ -1,12 +1,7 @@
#pragma once #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_MAGIC 0xE85250D6
#define MBOOT2_REPLY 0x36D76289 #define MBOOT2_REPLY 0x36D76289
#define MBOOT2_ARCH 0 #define MBOOT2_ARCH 0
#define MBOOT2_LENGTH (MultibootHeader2End - MultibootHeader2) #define MBOOT2_LENGTH (Multiboot2HeaderEnd - Multiboot2Header)
#define MBOOT2_CHECKSUM -(MBOOT2_MAGIC + MBOOT2_ARCH + MBOOT2_LENGTH) #define MBOOT2_CHECKSUM -(MBOOT2_MAGIC + MBOOT2_ARCH + MBOOT2_LENGTH)

3
toolchain/mkiso
View File

@ -15,9 +15,6 @@ set default=0
menuentry "mittos64" { menuentry "mittos64" {
multiboot2 /kernel multiboot2 /kernel
} }
menuentry "mittos64 multiboot1" {
multiboot /kernel
}
EOF EOF