[edk2] [patch] MdeModulePkg/DxeCapsuleLibFmp: Fix build failure

Dandan Bi posted 1 patch 7 years, 1 month ago
Failed in applying to current master (apply log)
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c     | 4 ++--
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
[edk2] [patch] MdeModulePkg/DxeCapsuleLibFmp: Fix build failure
Posted by Dandan Bi 7 years, 1 month ago
Move the definition of variable "mEsrtTable" and
"mIsVirtualAddrConverted" to DxeCapsuleLib.c.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c     | 4 ++--
 MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
index 49f1103..2f39778 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
@@ -45,12 +45,12 @@
 #include <Protocol/GraphicsOutput.h>
 #include <Protocol/EsrtManagement.h>
 #include <Protocol/FirmwareManagement.h>
 #include <Protocol/DevicePath.h>
 
-extern EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable;
-extern BOOLEAN                   mIsVirtualAddrConverted;
+EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable                  = NULL;
+BOOLEAN                   mIsVirtualAddrConverted      = FALSE;
 
 BOOLEAN                   mDxeCapsuleLibEndOfDxe       = FALSE;
 EFI_EVENT                 mDxeCapsuleLibEndOfDxeEvent  = NULL;
 
 /**
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
index 4725d53..c88a0fc 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
@@ -24,12 +24,12 @@
 #include <Library/DxeServicesTableLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/MemoryAllocationLib.h>
 
-EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable                                     = NULL;
-BOOLEAN                   mIsVirtualAddrConverted                         = FALSE;
+extern EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable;
+extern BOOLEAN                   mIsVirtualAddrConverted;
 EFI_EVENT                 mDxeRuntimeCapsuleLibVirtualAddressChangeEvent  = NULL;
 
 /**
   Convert EsrtTable physical address to virtual address.
 
-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [patch] MdeModulePkg/DxeCapsuleLibFmp: Fix build failure
Posted by Yao, Jiewen 7 years, 1 month ago
Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Bi, Dandan
> Sent: Monday, March 20, 2017 9:41 AM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [patch] MdeModulePkg/DxeCapsuleLibFmp: Fix build failure
> 
> Move the definition of variable "mEsrtTable" and
> "mIsVirtualAddrConverted" to DxeCapsuleLib.c.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
>  MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c     | 4 ++--
>  MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> index 49f1103..2f39778 100644
> --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
> @@ -45,12 +45,12 @@
>  #include <Protocol/GraphicsOutput.h>
>  #include <Protocol/EsrtManagement.h>
>  #include <Protocol/FirmwareManagement.h>
>  #include <Protocol/DevicePath.h>
> 
> -extern EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable;
> -extern BOOLEAN                   mIsVirtualAddrConverted;
> +EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable                  = NULL;
> +BOOLEAN                   mIsVirtualAddrConverted      = FALSE;
> 
>  BOOLEAN                   mDxeCapsuleLibEndOfDxe       = FALSE;
>  EFI_EVENT                 mDxeCapsuleLibEndOfDxeEvent  = NULL;
> 
>  /**
> diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
> b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
> index 4725d53..c88a0fc 100644
> --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
> +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
> @@ -24,12 +24,12 @@
>  #include <Library/DxeServicesTableLib.h>
>  #include <Library/UefiBootServicesTableLib.h>
>  #include <Library/UefiRuntimeServicesTableLib.h>
>  #include <Library/MemoryAllocationLib.h>
> 
> -EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable
> = NULL;
> -BOOLEAN                   mIsVirtualAddrConverted
> = FALSE;
> +extern EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable;
> +extern BOOLEAN                   mIsVirtualAddrConverted;
>  EFI_EVENT
> mDxeRuntimeCapsuleLibVirtualAddressChangeEvent  = NULL;
> 
>  /**
>    Convert EsrtTable physical address to virtual address.
> 
> --
> 1.9.5.msysgit.1

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