From 26a30abdd0f7fe5a9d2421cba6efe9397185ad98 Mon Sep 17 00:00:00 2001 From: Nhi Pham Date: Tue, 18 Jun 2024 16:41:53 +0700 Subject: MdeModulePkg/DxeCapsuleLibFmp: Fix compilation error The commit "MdeModulePkg/DxeCapsuleLibFmp: Fix crash if no ESRT is found" leads to a compilation error in MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf. The issue occurs because the variable mDxeCapsuleLibReadyToBootEvent which is declared as extern does not exist, while it is defined in DxeCapsuleRuntime.c, a file not included in DxeCapsuleLib.inf. This patch is to fix this by moving the variable defintion to DxeCapsuleLib.c and declare it as extern in DxeCapsuleRuntime.c. Reported-by: Gua Guo Signed-off-by: Nhi Pham --- MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 2 +- MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c index 36efd64..8befbae 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c @@ -49,7 +49,7 @@ EFI_EVENT mDxeCapsuleLibEndOfDxeEvent = NULL; EDKII_FIRMWARE_MANAGEMENT_PROGRESS_PROTOCOL *mFmpProgress = NULL; -extern BOOLEAN mDxeCapsuleLibReadyToBootEvent; +BOOLEAN mDxeCapsuleLibReadyToBootEvent = FALSE; /** Initialize capsule related variables. diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c index efff714..855b7a6 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c @@ -24,7 +24,7 @@ extern EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable; EFI_EVENT mDxeRuntimeCapsuleLibVirtualAddressChangeEvent = NULL; EFI_EVENT mDxeRuntimeCapsuleLibReadyToBootEvent = NULL; -BOOLEAN mDxeCapsuleLibReadyToBootEvent = FALSE; +extern BOOLEAN mDxeCapsuleLibReadyToBootEvent; /** Convert EsrtTable physical address to virtual address. -- cgit v1.1