diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2024-03-05 12:38:36 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-03-08 09:09:22 +0000 |
| commit | 9f9bf82209d2b7b2d0f9221c9e6c5eb901b9f772 (patch) | |
| tree | 4d57b54a3af7e77bccf8ad61ebc9491fdb2f3973 | |
| parent | 1fbc121cfeaaed04ddd67baceb7a8770b027d2da (diff) | |
| download | edk2-9f9bf82209d2b7b2d0f9221c9e6c5eb901b9f772.tar.gz edk2-9f9bf82209d2b7b2d0f9221c9e6c5eb901b9f772.tar.bz2 edk2-9f9bf82209d2b7b2d0f9221c9e6c5eb901b9f772.zip | |
OvmfPkg/IntelTdx: auto-gen & fix SEC ProcessLibraryConstructorList() decl
<Library/PeimEntryPoint.h> declares a bogus
ProcessLibraryConstructorList() for IntelTdx's SEC module. Rely on AutoGen
for (properly) declaring ProcessLibraryConstructorList(). Update the call.
Build-tested with:
build -a X64 -b DEBUG -m OvmfPkg/IntelTdx/Sec/SecMain.inf \
-p OvmfPkg/IntelTdx/IntelTdxX64.dsc -t GCC5
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=990
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20240305113843.68812-4-lersek@redhat.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | OvmfPkg/IntelTdx/Sec/SecMain.c | 3 | ||||
| -rw-r--r-- | OvmfPkg/IntelTdx/Sec/SecMain.inf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c index 42a587adfa..4e750755bf 100644 --- a/OvmfPkg/IntelTdx/Sec/SecMain.c +++ b/OvmfPkg/IntelTdx/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>
@@ -125,7 +124,7 @@ SecCoreStartupWithStack ( IdtDescriptor.Base = (UINTN)&IdtTableInStack.IdtTable;
IdtDescriptor.Limit = (UINT16)(sizeof (IdtTableInStack.IdtTable) - 1);
- ProcessLibraryConstructorList (NULL, NULL);
+ ProcessLibraryConstructorList ();
//
// Load the IDTR.
diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.inf b/OvmfPkg/IntelTdx/Sec/SecMain.inf index 7fb27941b7..cf95284f02 100644 --- a/OvmfPkg/IntelTdx/Sec/SecMain.inf +++ b/OvmfPkg/IntelTdx/Sec/SecMain.inf @@ -8,7 +8,7 @@ ##
[Defines]
- INF_VERSION = 0x00010005
+ INF_VERSION = 1.30
BASE_NAME = SecMain
FILE_GUID = 69d96630-eb64-4b33-8491-13a5cf023dcf
MODULE_TYPE = SEC
|