Add dual FSP binaries support.
There are two FSP images at different locations in a flash (one factory version is read only and other in updatable version) TempRamInit, FspMemoryInit and TempRamExit are executed from factory version and FspSiliconInit/NotifyPhase will be executed from updatable version. Also update FSP specification version to v1.1. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: "Ma, Maurice" <maurice.ma@intel.com> Reviewed-by: "Yao, Jiewen" <Jiewen.Yao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17248 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
;------------------------------------------------------------------------------
|
||||
;
|
||||
; Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||
; Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
|
||||
; This program and the accompanying materials
|
||||
; are licensed and made available under the terms and conditions of the BSD License
|
||||
; which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -28,7 +28,8 @@
|
||||
;------------------------------------------------------------------------------
|
||||
EXTERNDEF C MeasurePoint:PROC
|
||||
Pei2LoaderSwitchStack PROC C PUBLIC
|
||||
jmp Loader2PeiSwitchStack
|
||||
xor eax, eax
|
||||
jmp FspSwitchStack
|
||||
Pei2LoaderSwitchStack ENDP
|
||||
|
||||
;------------------------------------------------------------------------------
|
||||
@@ -38,10 +39,21 @@ Pei2LoaderSwitchStack ENDP
|
||||
; VOID
|
||||
; )
|
||||
;------------------------------------------------------------------------------
|
||||
EXTERNDEF C SwapStack:PROC
|
||||
Loader2PeiSwitchStack PROC C PUBLIC
|
||||
jmp FspSwitchStack
|
||||
Loader2PeiSwitchStack ENDP
|
||||
|
||||
;------------------------------------------------------------------------------
|
||||
; UINT32
|
||||
; EFIAPI
|
||||
; FspSwitchStack (
|
||||
; VOID
|
||||
; )
|
||||
;------------------------------------------------------------------------------
|
||||
EXTERNDEF C SwapStack:PROC
|
||||
FspSwitchStack PROC C PUBLIC
|
||||
; Save current contexts
|
||||
push offset exit
|
||||
push eax
|
||||
pushfd
|
||||
cli
|
||||
pushad
|
||||
@@ -58,8 +70,8 @@ Loader2PeiSwitchStack PROC C PUBLIC
|
||||
add esp, 8
|
||||
popad
|
||||
popfd
|
||||
exit:
|
||||
add esp, 4
|
||||
ret
|
||||
Loader2PeiSwitchStack ENDP
|
||||
FspSwitchStack ENDP
|
||||
|
||||
END
|
||||
|
@@ -25,20 +25,33 @@
|
||||
#------------------------------------------------------------------------------
|
||||
ASM_GLOBAL ASM_PFX(Pei2LoaderSwitchStack)
|
||||
ASM_PFX(Pei2LoaderSwitchStack):
|
||||
jmp ASM_PFX(Loader2PeiSwitchStack)
|
||||
xorl %eax, %eax
|
||||
jmp ASM_PFX(FspSwitchStack)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# UINT32
|
||||
# EFIAPI
|
||||
# Loader2PeiSwitchStack (
|
||||
# VOID
|
||||
# )
|
||||
#------------------------------------------------------------------------------
|
||||
ASM_GLOBAL ASM_PFX(Loader2PeiSwitchStack)
|
||||
ASM_PFX(Loader2PeiSwitchStack):
|
||||
jmp ASM_PFX(FspSwitchStack)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# UINT32
|
||||
# EFIAPI
|
||||
# FspSwitchStack (
|
||||
# VOID
|
||||
# )
|
||||
#------------------------------------------------------------------------------
|
||||
ASM_GLOBAL ASM_PFX(FspSwitchStack)
|
||||
ASM_PFX(FspSwitchStack):
|
||||
#
|
||||
#Save current contexts
|
||||
#
|
||||
push $exit
|
||||
push %eax
|
||||
pushf
|
||||
cli
|
||||
pusha
|
||||
@@ -59,7 +72,7 @@ ASM_PFX(Loader2PeiSwitchStack):
|
||||
add $0x08,%esp
|
||||
popa
|
||||
popf
|
||||
exit:
|
||||
add $0x04,%esp
|
||||
ret
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user