[v3] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option

[edk2] [PATCH V3] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option

Posted by Song, BinX 6 years, 8 months ago

V3:
- Update dummy TempRamInitApi function and remove unnecessary info

V2:
- Recover TempRamInitApi API and add dummy TempRamInitApi function to fix
  build error with WHOLEARCHIVE option

V1:
- Delete useless external TempRamInitApi API to fix /WHOLEARCHIVE build
  error

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bell Song <binx.song@intel.com>
---
 IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm | 11 +++++++++++
 IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
index 9744e16..6833ca3 100644
--- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
+++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
@@ -195,6 +195,17 @@ ASM_PFX(AsmGetPeiCoreOffset):
    ret
 
 ;----------------------------------------------------------------------------
+; TempRamInit API
+;
+; Dummy function for WHOLEARCHIVE build option
+;
+;----------------------------------------------------------------------------
+global ASM_PFX(TempRamInitApi)
+ASM_PFX(TempRamInitApi):
+  jmp $
+  ret
+
+;----------------------------------------------------------------------------
 ; Module Entrypoint API
 ;----------------------------------------------------------------------------
 global ASM_PFX(_ModuleEntryPoint)
diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
index cdc1149..80678dd 100644
--- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
+++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
@@ -54,6 +54,17 @@ ASM_PFX(FspApiCommonContinue):
   ret
 
 ;----------------------------------------------------------------------------
+; TempRamInit API
+;
+; Dummy function for WHOLEARCHIVE build option
+;
+;----------------------------------------------------------------------------
+global ASM_PFX(TempRamInitApi)
+ASM_PFX(TempRamInitApi):
+  jmp $
+  ret
+
+;----------------------------------------------------------------------------
 ; Module Entrypoint API
 ;----------------------------------------------------------------------------
 global ASM_PFX(_ModuleEntryPoint)
-- 
2.10.2.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH V3] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option

Posted by Yao, Jiewen 6 years, 8 months ago

Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Song, BinX
> Sent: Monday, August 21, 2017 4:45 PM
> To: Yao, Jiewen <jiewen.yao@intel.com>
> Cc: edk2-devel@lists.01.org
> Subject: [PATCH V3] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option
> 
> V3:
> - Update dummy TempRamInitApi function and remove unnecessary info
> 
> V2:
> - Recover TempRamInitApi API and add dummy TempRamInitApi function to fix
>   build error with WHOLEARCHIVE option
> 
> V1:
> - Delete useless external TempRamInitApi API to fix /WHOLEARCHIVE build
>   error
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Bell Song <binx.song@intel.com>
> ---
>  IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm | 11 +++++++++++
>  IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm | 11 +++++++++++
>  2 files changed, 22 insertions(+)
> 
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> index 9744e16..6833ca3 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> @@ -195,6 +195,17 @@ ASM_PFX(AsmGetPeiCoreOffset):
>     ret
> 
>  ;----------------------------------------------------------------------------
> +; TempRamInit API
> +;
> +; Dummy function for WHOLEARCHIVE build option
> +;
> +;----------------------------------------------------------------------------
> +global ASM_PFX(TempRamInitApi)
> +ASM_PFX(TempRamInitApi):
> +  jmp $
> +  ret
> +
> +;----------------------------------------------------------------------------
>  ; Module Entrypoint API
>  ;----------------------------------------------------------------------------
>  global ASM_PFX(_ModuleEntryPoint)
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> index cdc1149..80678dd 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> @@ -54,6 +54,17 @@ ASM_PFX(FspApiCommonContinue):
>    ret
> 
>  ;----------------------------------------------------------------------------
> +; TempRamInit API
> +;
> +; Dummy function for WHOLEARCHIVE build option
> +;
> +;----------------------------------------------------------------------------
> +global ASM_PFX(TempRamInitApi)
> +ASM_PFX(TempRamInitApi):
> +  jmp $
> +  ret
> +
> +;----------------------------------------------------------------------------
>  ; Module Entrypoint API
>  ;----------------------------------------------------------------------------
>  global ASM_PFX(_ModuleEntryPoint)
> --
> 2.10.2.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel