<Library/PeimEntryPoint.h> declares a bogus
ProcessLibraryConstructorList() for the SG2042Pkg 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 Silicon/Sophgo/SG2042Pkg/Sec/SecMain.inf \
    -p Platform/Sophgo/SG2042_EVB_Board/SG2042.dsc -t GCC5

Cc: Sunil V L <suni...@ventanamicro.com>
Cc: USER0FISH <libing1...@outlook.com>
Cc: caiyuqing379 <caiyuqing...@outlook.com>
Cc: dahogn <dah...@hotmail.com>
Cc: meng-cz <mengcz1...@gmail.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=990
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
---
 Silicon/Sophgo/SG2042Pkg/Sec/SecMain.inf |  2 +-
 Silicon/Sophgo/SG2042Pkg/Sec/SecMain.h   | 12 ------------
 Silicon/Sophgo/SG2042Pkg/Sec/Memory.c    |  1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Silicon/Sophgo/SG2042Pkg/Sec/SecMain.inf 
b/Silicon/Sophgo/SG2042Pkg/Sec/SecMain.inf
index a9f631193b8b..fd52dccfacac 100644
--- a/Silicon/Sophgo/SG2042Pkg/Sec/SecMain.inf
+++ b/Silicon/Sophgo/SG2042Pkg/Sec/SecMain.inf
@@ -9,7 +9,7 @@
 ##
 
 [Defines]
-  INF_VERSION                    = 0x0001001B
+  INF_VERSION                    = 1.30
   BASE_NAME                      = SecMainRiscV64
   FILE_GUID                      = 125E1236-9D4F-457B-BF7E-6311C88A1621
   MODULE_TYPE                    = SEC
diff --git a/Silicon/Sophgo/SG2042Pkg/Sec/SecMain.h 
b/Silicon/Sophgo/SG2042Pkg/Sec/SecMain.h
index 8d2c4a4c25e0..daab7c78b409 100644
--- a/Silicon/Sophgo/SG2042Pkg/Sec/SecMain.h
+++ b/Silicon/Sophgo/SG2042Pkg/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/Silicon/Sophgo/SG2042Pkg/Sec/Memory.c 
b/Silicon/Sophgo/SG2042Pkg/Sec/Memory.c
index 51974cf2dc28..df49a17695d1 100644
--- a/Silicon/Sophgo/SG2042Pkg/Sec/Memory.c
+++ b/Silicon/Sophgo/SG2042Pkg/Sec/Memory.c
@@ -19,7 +19,6 @@ Module Name:
 #include <Library/HobLib.h>
 #include <Library/IoLib.h>
 #include <Library/PcdLib.h>
-#include <Library/PeimEntryPoint.h>
 #include <Library/ResourcePublicationLib.h>
 #include <Register/RiscV64/RiscVEncoding.h>
 #include <Library/PrePiLib.h>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116382): https://edk2.groups.io/g/devel/message/116382
Mute This Topic: https://groups.io/mt/104742763/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to