tailix/kernel
1
0
Fork 0
mirror of https://github.com/tailix/kernel.git synced 2025-04-14 17:33:13 -04:00
Code Releases Activity

Support both Multiboot 1 and 2

Browse source
This commit is contained in:
Braiden Vasco 2017-11-01 08:53:27 +00:00
parent 5b23dead92
commit aa71f8e70b
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/Makefile
View file

@ -16,6 +16,8 @@ clean:
kernel: $(OBJS)
$(CC) -T linker.ld -o $@ -ffreestanding -nostdlib -lgcc $(OBJS)
grub-file --is-x86-multiboot $@
grub-file --is-x86-multiboot2 $@
%.c.o: %.c
$(CC) -c $< -o $@ -std=gnu99 -ffreestanding -fno-builtin -fno-stack-protector -Wall -Wextra -I$(I)

28
arch/boot.s
View file

@ -1,14 +1,24 @@
.set ALIGN, 1<<0
.set MEMINFO, 1<<1
.set FLAGS, ALIGN | MEMINFO
.set MAGIC, 0x1BADB002
.set CHECKSUM, -(MAGIC + FLAGS)
.set MULTIBOOT_1_MAGIC, 0x1BADB002
.set MULTIBOOT_1_FLAGS, (1 << 0) | (1 << 1) // Align, meminfo
.set MULTIBOOT_1_CHECKSUM, -(MULTIBOOT_1_MAGIC + MULTIBOOT_1_FLAGS)
.section .multiboot
.set MULTIBOOT_2_MAGIC, 0xE85250D6
.set MULTIBOOT_2_ARCH, 0
.set MULTIBOOT_2_LENGTH, 16
.set MULTIBOOT_2_CHECKSUM, -(MULTIBOOT_2_MAGIC + MULTIBOOT_2_ARCH + MULTIBOOT_2_LENGTH)
.section .multiboot2
.align 4
.long MAGIC
.long FLAGS
.long CHECKSUM
.long MULTIBOOT_2_MAGIC
.long MULTIBOOT_2_ARCH
.long MULTIBOOT_2_LENGTH
.long MULTIBOOT_2_CHECKSUM
.section .multiboot1
.align 4
.long MULTIBOOT_1_MAGIC
.long MULTIBOOT_1_FLAGS
.long MULTIBOOT_1_CHECKSUM
.section .bss
.align 16

3
arch/linker.ld
View file

@ -6,7 +6,8 @@ SECTIONS
.text BLOCK(4K) : ALIGN(4K)
{
*(.multiboot)
*(.multiboot2)
*(.multiboot1)
*(.text)
}