gwdev/Syncboot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: gwdev:1bbcacb90eadde2bf2114efe25ed93d7920bbef6
Branches Tags
gwdev:master
...
compare: gwdev:a06a298f8f5a371174b0b972dccfb6119a24fd5b
Branches Tags
gwdev:master

2 Commits
1bbcacb90e ... a06a298f8f

Author SHA1 Message Date
Curle
a06a298f8f Merge branch 'master' of https://git.gemwire.uk/gwdev/Syncboot 2019-08-14 19:27:02 +01:00
Curle
7601f3d93b Three very minor changes. 
The bootloader is now functionally complete.

Some minor bugs may remain, but it now properly loads the Sync kernel on hardware.
 2019-08-14 19:25:38 +01:00
1 changed files with 3 additions and 6 deletions
Show Stats Expand all files Collapse all files

9
src/bootloader.c
View File

@ -45,12 +45,9 @@ EFI_STATUS LoadKernel(EFI_HANDLE ImageHandle, GFX_INFO* Graphics, EFI_CONFIGURAT
}
Print(L"Syncboot loaded at 0x%llx\n", LoadedImage->ImageBase);
Print(L"BootServices start at 0x%llx, ExitBootServices at %llx.\r\n", BS, BS->ExitBootServices);
AwaitKey("\0");
int Loop = 1;
while (Loop) {
__asm volatile("pause");
}
/* Get the path to the device */
CHAR16* ESPRootTemp = DevicePathToStr(DevicePathFromHandle(LoadedImage->DeviceHandle));
@ -1460,7 +1457,7 @@ EFI_STATUS LoadKernel(EFI_HANDLE ImageHandle, GFX_INFO* Graphics, EFI_CONFIGURAT
FILELOADER_PARAMS* LoaderBlock;
KernelStatus = BS->AllocatePool(EfiLoaderData, sizeof(FILELOADER_PARAMS), (void**)LoaderBlock);
KernelStatus = BS->AllocatePool(EfiLoaderData, sizeof(FILELOADER_PARAMS), (void**)&LoaderBlock);
if (EFI_ERROR(KernelStatus)) {
Print(L"Error allocating loaderblock pool. Code 0x%llx\r\n", KernelStatus);
return KernelStatus;
@ -1525,7 +1522,7 @@ EFI_STATUS LoadKernel(EFI_HANDLE ImageHandle, GFX_INFO* Graphics, EFI_CONFIGURAT
}
}
AwaitKey(L"Done! Next step is jumping to kernel.\r\n");
// AwaitKey(L"Done! Next step is jumping to kernel.\r\n");
// Call the kernel!
LoaderBlock->UEFI_Version = UEFIVer;