OvmfPkg LoadLinuxLib: Use kernel's EFI entry point where available

[mirror_edk2.git] / OvmfPkg / Library / LoadLinuxLib / Ia32 / JumpToKernel.S

diff --git a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S
index b8cd4ca515bee248d6a62822f49c0b12d8fcb136..f7440f74c401501026d58317e2d118f476ab0819 100644 (file)
--- a/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S
+++ b/OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------\r
 #\r
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -13,6 +13,7 @@
 #------------------------------------------------------------------------------\r
 \r
 ASM_GLOBAL ASM_PFX(JumpToKernel)\r
+ASM_GLOBAL ASM_PFX(JumpToUefiKernel)\r
 \r
 #------------------------------------------------------------------------------\r
 # VOID\r
@@ -27,3 +28,19 @@ ASM_PFX(JumpToKernel):
     calll   0x4(%esp)\r
     ret\r
 \r
+#------------------------------------------------------------------------------\r
+# VOID\r
+# EFIAPI\r
+# JumpToUefiKernel (\r
+#   EFI_HANDLE ImageHandle,\r
+#   EFI_SYSTEM_TABLE *SystemTable,\r
+#   VOID *KernelBootParams,\r
+#   VOID *KernelStart\r
+#   );\r
+#------------------------------------------------------------------------------\r
+ASM_PFX(JumpToUefiKernel):\r
+    movl    0xc(%esp), %eax\r
+    movl    0x264(%eax), %eax\r
+    addl    0x10(%esp), %eax\r
+    jmp     %eax\r
+\r