From f940fea8b1c914082bd86238068c3561c2ecd540 Mon Sep 17 00:00:00 2001 From: jljusten Date: Mon, 28 Jan 2013 16:55:22 +0000 Subject: 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 --- OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S | 22 --------------------- OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.asm | 24 ----------------------- 2 files changed, 46 deletions(-) (limited to 'OvmfPkg/Library/LoadLinuxLib/X64') diff --git a/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S b/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S index 06d0a1f556..edc6e7bd70 100644 --- a/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S +++ b/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S @@ -13,7 +13,6 @@ #------------------------------------------------------------------------------ ASM_GLOBAL ASM_PFX(JumpToKernel) -ASM_GLOBAL ASM_PFX(JumpToUefiKernel) #------------------------------------------------------------------------------ # VOID @@ -68,24 +67,3 @@ ASM_PFX(JumpToKernel): ret .code64 -#------------------------------------------------------------------------------ -# VOID -# EFIAPI -# JumpToUefiKernel ( -# EFI_HANDLE ImageHandle, -# EFI_SYSTEM_TABLE *SystemTable, -# VOID *KernelBootParams, -# VOID *KernelStart -# ); -#------------------------------------------------------------------------------ -ASM_PFX(JumpToUefiKernel): - movq %rcx, %rdi - movq %rdx, %rsi - movq %r8, %rdx - xor %rax, %rax - movl 0x264(%r8), %eax - addq %rax, %r9 - addq $0x200, %r9 - callq %r9 - ret - diff --git a/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.asm b/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.asm index fc07eab684..bcf6260e1d 100644 --- a/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.asm +++ b/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.asm @@ -68,28 +68,4 @@ JumpToKernel PROC JumpToKernel ENDP -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; JumpToUefiKernel ( -; EFI_HANDLE ImageHandle, // rcx -; EFI_SYSTEM_TABLE *SystemTable, // rdx -; VOID *KernelBootParams // r8 -; VOID *KernelStart, // r9 -; ); -;------------------------------------------------------------------------------ -JumpToUefiKernel PROC - - mov rdi, rcx - mov rsi, rdx - mov rdx, r8 - xor rax, rax - mov eax, [r8 + 264h] - add r9, rax - add r9, 200h - call r9 - ret - -JumpToUefiKernel ENDP - END -- cgit v1.2.3