Revert "OvmfPkg: LoadLinuxLib: Use kernel's EFI entry point where available"
This reverts commit r14053. This change depends on changes to the kernel which are not yet finalized/upstream. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14110 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -604,11 +604,14 @@ SetupGraphics (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
SetupLinuxBootParams (
|
||||
IN VOID *Kernel,
|
||||
IN OUT struct boot_params *Bp
|
||||
)
|
||||
{
|
||||
SetupGraphics (Bp);
|
||||
|
||||
Bp->hdr.code32_start = (UINT32)(UINTN) Kernel;
|
||||
|
||||
SetupLinuxMemmap (Bp);
|
||||
|
||||
return EFI_SUCCESS;
|
||||
@@ -641,18 +644,7 @@ LoadLinux (
|
||||
|
||||
InitLinuxDescriptorTables ();
|
||||
|
||||
Bp->hdr.code32_start = (UINT32)(UINTN) Kernel;
|
||||
if (Bp->hdr.version >= 0x20b && Bp->hdr.handover_offset &&
|
||||
(Bp->hdr.load_flags & (sizeof(long) >> 1))) {
|
||||
DEBUG ((EFI_D_INFO, "Jumping to kernel EFI handover point at ofs %x\n", Bp->hdr.handover_offset));
|
||||
|
||||
DisableInterrupts ();
|
||||
JumpToUefiKernel ((VOID*) gImageHandle, (VOID*) gST, KernelSetup, Kernel);
|
||||
}
|
||||
//
|
||||
// Old kernels without EFI handover protocol
|
||||
//
|
||||
SetupLinuxBootParams (KernelSetup);
|
||||
SetupLinuxBootParams (Kernel, (struct boot_params*) KernelSetup);
|
||||
|
||||
DEBUG ((EFI_D_INFO, "Jumping to kernel\n"));
|
||||
DisableInterrupts ();
|
||||
|
Reference in New Issue
Block a user