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

We got the config to load

This commit is contained in:
mintsuki 2021-03-04 07:18:00 +01:00
parent 1be84baf84
commit 7be0b35f6f
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -123,20 +123,12 @@ fat32-test: | test-clean test.hdd bootloader all
sudo mount `cat loopback_dev`p1 test_image
sudo mkdir test_image/boot
sudo cp -rv bin/* test/* test_image/boot/
ifeq ($(TARGET), uefi)
sudo mkdir -p test_image/EFI/BOOT
sudo cp bin/BOOTX64.EFI test_image/EFI/BOOT/
endif
sync
sudo umount test_image/
sudo losetup -d `cat loopback_dev`
rm -rf test_image loopback_dev
bin/limine-install test.hdd
ifeq ($(TARGET), bios)
qemu-system-x86_64 -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio
else ifeq ($(TARGET), uefi)
qemu-system-x86_64 -L ovmf -bios ovmf/OVMF.fd -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio
endif
iso9660-test: | test-clean test.hdd bootloader
$(MAKE) -C test

1
stage23/Makefile
View File

@ -125,6 +125,7 @@ limine_efi.elf: $(OBJ) font.o sys/smp_trampoline.o
-T../gnu-efi/gnuefi/elf_x86_64_efi.lds \
../gnu-efi/x86_64/gnuefi/crt0-efi-x86_64.o \
../gnu-efi/x86_64/gnuefi/libgnuefi.a \
../gnu-efi/lib/x86_64/efi_stub.o \
$(OBJ) font.o sys/smp_trampoline.o -o $@
-include $(HEADER_DEPS)

7
stage23/entry.s3.c
View File

@ -24,15 +24,12 @@
void stage3_common(void);
#if defined (uefi)
__attribute__((ms_abi))
EFI_STATUS efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) {
(void)ImageHandle;
EFI_STATUS EFIAPI efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) {
gST = SystemTable;
gBS = SystemTable->BootServices;
gRT = SystemTable->RuntimeServices;
print("Limine " LIMINE_VERSION "\n%X\n", print);
print("Limine " LIMINE_VERSION "\n\n", print);
volume_create_index();