From: "Laszlo Ersek" <lersek@redhat.com>
To: edk2-devel-groups-io <devel@edk2.groups.io>
Cc: Andrei Warkentin <andrei.warkentin@intel.com>,
Ard Biesheuvel <ardb+tianocore@kernel.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Sunil V L <sunilvl@ventanamicro.com>
Subject: [edk2-devel] [PATCH v2 04/10] OvmfPkg/RiscVVirt/Sec: clean up ProcessLibraryConstructorList() decl
Date: Tue, 5 Mar 2024 12:38:37 +0100 [thread overview]
Message-ID: <20240305113843.68812-5-lersek@redhat.com> (raw)
In-Reply-To: <20240305113843.68812-1-lersek@redhat.com>
<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>
---
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/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-03-05 11:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 11:38 [edk2-devel] [PATCH v2 00/10] clean up ProcessLibraryConstructorList() declarations in SEC modules Laszlo Ersek
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 01/10] pip-requirements.txt: require edk2-basetools version 0.1.51 Laszlo Ersek
2024-03-06 21:08 ` Laszlo Ersek
2024-03-06 22:22 ` Michael D Kinney
2024-03-06 21:17 ` Rebecca Cran
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 02/10] OvmfPkg: auto-generate (and fix) SEC ProcessLibraryConstructorList() decl Laszlo Ersek
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 03/10] OvmfPkg/IntelTdx: auto-gen & fix " Laszlo Ersek
2024-03-05 11:38 ` Laszlo Ersek [this message]
2024-03-05 14:06 ` [edk2-devel] [PATCH v2 04/10] OvmfPkg/RiscVVirt/Sec: clean up " Sunil V L
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 05/10] ArmPlatformPkg: auto-generate SEC " Laszlo Ersek
2024-03-05 13:02 ` Ard Biesheuvel
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 06/10] ArmVirtPkg: " Laszlo Ersek
2024-03-05 13:01 ` Ard Biesheuvel
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 07/10] EmulatorPkg: " Laszlo Ersek
2024-03-06 21:09 ` Laszlo Ersek
2024-03-06 22:36 ` Michael D Kinney
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 08/10] IntelFsp2Pkg: " Laszlo Ersek
2024-03-06 21:09 ` Laszlo Ersek
2024-03-07 9:09 ` Zeng, Star
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 09/10] UefiCpuPkg: " Laszlo Ersek
2024-03-06 21:10 ` Laszlo Ersek
2024-03-05 11:38 ` [edk2-devel] [PATCH v2 10/10] UefiPayloadPkg: " Laszlo Ersek
2024-03-06 21:10 ` Laszlo Ersek
2024-03-05 12:26 ` [edk2-devel] [PATCH v2 00/10] clean up ProcessLibraryConstructorList() declarations in SEC modules Yao, Jiewen
2024-03-07 8:24 ` Gerd Hoffmann
2024-03-08 9:13 ` Laszlo Ersek
2024-03-08 9:34 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240305113843.68812-5-lersek@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox