diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2024-03-05 12:38:37 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-03-08 09:09:22 +0000 |
| commit | 524feaa32f0fde6b22a40e606b848b6aa42b6751 (patch) | |
| tree | bba96acc859a07d747bed26563d2c17e25442660 | |
| parent | 9f9bf82209d2b7b2d0f9221c9e6c5eb901b9f772 (diff) | |
| download | edk2-524feaa32f0fde6b22a40e606b848b6aa42b6751.tar.gz edk2-524feaa32f0fde6b22a40e606b848b6aa42b6751.tar.bz2 edk2-524feaa32f0fde6b22a40e606b848b6aa42b6751.zip | |
OvmfPkg/RiscVVirt/Sec: clean up ProcessLibraryConstructorList() decl
<Library/PeimEntryPoint.h> declares a bogus
ProcessLibraryConstructorList() for the OvmfPkg/RiscVVirt SEC module. Rely
on AutoGen for (properly) declaring ProcessLibraryConstructorList().
Remove the correct, but superfluous, declaration as well.
Build-tested with:
build -a RISCV64 -b DEBUG -m OvmfPkg/RiscVVirt/Sec/SecMain.inf \
-p OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc -t GCC5
Cc: Andrei Warkentin <andrei.warkentin@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=990
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20240305113843.68812-5-lersek@redhat.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | OvmfPkg/RiscVVirt/Sec/Memory.c | 1 | ||||
| -rw-r--r-- | OvmfPkg/RiscVVirt/Sec/SecMain.h | 12 | ||||
| -rw-r--r-- | OvmfPkg/RiscVVirt/Sec/SecMain.inf | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/OvmfPkg/RiscVVirt/Sec/Memory.c b/OvmfPkg/RiscVVirt/Sec/Memory.c index 7c6d920bd2..14c9569c78 100644 --- a/OvmfPkg/RiscVVirt/Sec/Memory.c +++ b/OvmfPkg/RiscVVirt/Sec/Memory.c @@ -25,7 +25,6 @@ Module Name: #include <Library/HobLib.h>
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
-#include <Library/PeimEntryPoint.h>
#include <Library/ResourcePublicationLib.h>
#include <Library/BaseRiscVSbiLib.h>
#include <Register/RiscV64/RiscVEncoding.h>
diff --git a/OvmfPkg/RiscVVirt/Sec/SecMain.h b/OvmfPkg/RiscVVirt/Sec/SecMain.h index 7c7650f0d2..fd7c48f876 100644 --- a/OvmfPkg/RiscVVirt/Sec/SecMain.h +++ b/OvmfPkg/RiscVVirt/Sec/SecMain.h @@ -50,18 +50,6 @@ SecStartup ( );
/**
- Auto-generated function that calls the library constructors for all of the module's
- dependent libraries. This function must be called by the SEC Core once a stack has
- been established.
-
-**/
-VOID
-EFIAPI
-ProcessLibraryConstructorList (
- VOID
- );
-
-/**
Perform Platform PEIM initialization.
@return EFI_SUCCESS The platform initialized successfully.
diff --git a/OvmfPkg/RiscVVirt/Sec/SecMain.inf b/OvmfPkg/RiscVVirt/Sec/SecMain.inf index 0e2a5785e8..73df0ee4cb 100644 --- a/OvmfPkg/RiscVVirt/Sec/SecMain.inf +++ b/OvmfPkg/RiscVVirt/Sec/SecMain.inf @@ -8,7 +8,7 @@ ##
[Defines]
- INF_VERSION = 0x0001001B
+ INF_VERSION = 1.30
BASE_NAME = SecMainRiscV64
FILE_GUID = 16740C0A-AA84-4F62-A06D-AE328057AE07
MODULE_TYPE = SEC
|