<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 <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Sunil V L <[email protected]>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=990
Signed-off-by: Laszlo Ersek <[email protected]>
---
OvmfPkg/RiscVVirt/Sec/SecMain.inf | 2 +-
OvmfPkg/RiscVVirt/Sec/SecMain.h | 12 ------------
OvmfPkg/RiscVVirt/Sec/Memory.c | 1 -
3 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/OvmfPkg/RiscVVirt/Sec/SecMain.inf
b/OvmfPkg/RiscVVirt/Sec/SecMain.inf
index 0e2a5785e8a4..73df0ee4cbe7 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
diff --git a/OvmfPkg/RiscVVirt/Sec/SecMain.h b/OvmfPkg/RiscVVirt/Sec/SecMain.h
index 7c7650f0d298..fd7c48f87653 100644
--- a/OvmfPkg/RiscVVirt/Sec/SecMain.h
+++ b/OvmfPkg/RiscVVirt/Sec/SecMain.h
@@ -49,18 +49,6 @@ SecStartup (
IN VOID *DeviceTreeAddress
);
-/**
- 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.
diff --git a/OvmfPkg/RiscVVirt/Sec/Memory.c b/OvmfPkg/RiscVVirt/Sec/Memory.c
index 7c6d920bd2a6..14c9569c78d4 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>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116370): https://edk2.groups.io/g/devel/message/116370
Mute This Topic: https://groups.io/mt/104742524/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
