diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-01-28 16:55:22 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-01-28 16:55:22 +0000 |
| commit | f940fea8b1c914082bd86238068c3561c2ecd540 (patch) | |
| tree | 4ead13dea838403d135c4d7d69bb25c7dc94ceab /OvmfPkg/Library/LoadLinuxLib/Linux.c | |
| parent | 29874a8c6015deff95e90e64fb9321bdc7b32a99 (diff) | |
| download | edk2-platforms-f940fea8b1c914082bd86238068c3561c2ecd540.tar.xz | |
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
Diffstat (limited to 'OvmfPkg/Library/LoadLinuxLib/Linux.c')
| -rw-r--r-- | OvmfPkg/Library/LoadLinuxLib/Linux.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/OvmfPkg/Library/LoadLinuxLib/Linux.c b/OvmfPkg/Library/LoadLinuxLib/Linux.c index 862698a39e..1da5507ff1 100644 --- a/OvmfPkg/Library/LoadLinuxLib/Linux.c +++ b/OvmfPkg/Library/LoadLinuxLib/Linux.c @@ -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 ();
|