Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Minor multiboot fixes

Browse Source
This commit is contained in:
mintsuki 2021-11-19 15:17:37 +01:00
parent 6e61b4bd50
commit 30b0657e38
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/Makefile
View File

@ -65,4 +65,6 @@ multiboot.elf: multiboot_trampoline.o
nasm -felf32 $< -o $@ nasm -felf32 $< -o $@
clean: clean:
rm -rf test.elf stivale.o stivale2.o e9print.o memory.o multiboot2.o multiboot2.elf multiboot2_trampoline.o multiboot_trampoline.o multiboot.elf rm -rf test.elf stivale.o stivale2.o e9print.o memory.o
rm -rf multiboot2.o multiboot2.elf multiboot2_trampoline.o
rm -rf multiboot.o multiboot_trampoline.o multiboot.elf

32
test/limine.cfg
View File

@ -1,4 +1,4 @@
DEFAULT_ENTRY=3 DEFAULT_ENTRY=1
TIMEOUT=3 TIMEOUT=3
GRAPHICS=yes GRAPHICS=yes
VERBOSE=yes VERBOSE=yes
@ -38,21 +38,6 @@ KERNEL_CMDLINE=Woah! Another another example!
MODULE_PATH=boot:///boot/bg.bmp MODULE_PATH=boot:///boot/bg.bmp
MODULE_STRING=This is the background image! MODULE_STRING=This is the background image!
:Multiboot1 Test
COMMENT=Test of the multiboot1 boot protocol.
PROTOCOL=multiboot1
RESOLUTION=800x600
KERNEL_PATH=boot:///boot/multiboot.elf
KERNEL_CMDLINE=Woah! Another another another example!
MODULE_PATH=boot:///boot/bg.bmp
MODULE_STRING=This is the background image! Yay!
# Test that this should be NULL:
MODULE_PATH=boot:///boot/bg.bmp
:EFI Chainloading :EFI Chainloading
COMMENT=Test EFI image chainloading. COMMENT=Test EFI image chainloading.
@ -78,6 +63,21 @@ MODULE_STRING=yooooo
MODULE_PATH=boot:///boot/bg.bmp MODULE_PATH=boot:///boot/bg.bmp
MODULE_STRING=yooooo MODULE_STRING=yooooo
::Multiboot1 Test
COMMENT=Test of the multiboot1 boot protocol.
PROTOCOL=multiboot1
RESOLUTION=800x600
KERNEL_PATH=boot:///boot/multiboot.elf
KERNEL_CMDLINE=Woah! Another another another example!
MODULE_PATH=boot:///boot/bg.bmp
MODULE_STRING=This is the background image! Yay!
# Test that this should be NULL:
MODULE_PATH=boot:///boot/bg.bmp
:Test hdd:// :Test hdd://
PROTOCOL=stivale2 PROTOCOL=stivale2