diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2024-03-05 12:38:35 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-03-08 09:09:22 +0000 |
| commit | 1fbc121cfeaaed04ddd67baceb7a8770b027d2da (patch) | |
| tree | b2650a654daee8a6dc96b02a7c1c81599589bfa7 | |
| parent | da4aa451bab4ffb338acfdfdb2b84fc92be60327 (diff) | |
| download | edk2-1fbc121cfeaaed04ddd67baceb7a8770b027d2da.tar.gz edk2-1fbc121cfeaaed04ddd67baceb7a8770b027d2da.tar.bz2 edk2-1fbc121cfeaaed04ddd67baceb7a8770b027d2da.zip | |
OvmfPkg: auto-generate (and fix) SEC ProcessLibraryConstructorList() decl
<Library/PeimEntryPoint.h> declares a bogus
ProcessLibraryConstructorList() for OVMF's SEC module. Rely on AutoGen for
(properly) declaring ProcessLibraryConstructorList(). Update the call.
Build-tested with:
build -a X64 -b DEBUG -m OvmfPkg/Sec/SecMain.inf \
-p OvmfPkg/OvmfPkgX64.dsc -t GCC5
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Michael Roth <michael.roth@amd.com>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=990
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4643
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20240305113843.68812-3-lersek@redhat.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | OvmfPkg/Sec/SecMain.c | 3 | ||||
| -rw-r--r-- | OvmfPkg/Sec/SecMain.inf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c index 31da5d0ace..a30d4ce09e 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c @@ -11,7 +11,6 @@ #include <PiPei.h>
-#include <Library/PeimEntryPoint.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
@@ -844,7 +843,7 @@ SecCoreStartupWithStack ( InitializeCpuExceptionHandlers (NULL);
}
- ProcessLibraryConstructorList (NULL, NULL);
+ ProcessLibraryConstructorList ();
if (!SevEsIsEnabled ()) {
//
diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf index 3c47a664a9..dca932a474 100644 --- a/OvmfPkg/Sec/SecMain.inf +++ b/OvmfPkg/Sec/SecMain.inf @@ -8,7 +8,7 @@ ##
[Defines]
- INF_VERSION = 0x00010005
+ INF_VERSION = 1.30
BASE_NAME = SecMain
FILE_GUID = df1ccef6-f301-4a63-9661-fc6030dcc880
MODULE_TYPE = SEC
|