c2624089创建于 2024年12月12日历史提交
From 69e129dc2faa09647294aadadca2fc8abe63f3d1 Mon Sep 17 00:00:00 2001
From: Xiaotian Wu <wuxiaotian@loongson.cn>
Date: Fri, 13 Sep 2024 10:35:51 +0800
Subject: [PATCH 3/3] Revert "LoongArchQemuPkg: auto-gen & fix SEC
 ProcessLibraryConstructorList() decl"

This reverts commit a81b9f2815da1bacb91aa5ece1caa730ac5d80bb.
---
 Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.c   | 3 ++-
 Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.inf | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.c b/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.c
index 50d898859a..3f1998c48c 100644
--- a/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.c
+++ b/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.c
@@ -9,6 +9,7 @@
 

 #include <PiPei.h>

 

+#include <Library/PeimEntryPoint.h>

 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 #include <Library/BaseMemoryLib.h>

@@ -377,7 +378,7 @@ SecCoreStartupWithStack (
 

   DEBUG ((DEBUG_INFO, "Entering C environment\n"));

 

-  ProcessLibraryConstructorList ();

+  ProcessLibraryConstructorList (NULL, NULL);

 

   DEBUG ((DEBUG_INFO,

     "SecCoreStartupWithStack (0x%lx, 0x%lx)\n",

diff --git a/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.inf b/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.inf
index bb86c7c774..c0d5439d53 100644
--- a/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.inf
+++ b/Platform/Loongson/LoongArchQemuPkg/Sec/SecMain.inf
@@ -8,7 +8,7 @@
 ##

 

 [Defines]

-  INF_VERSION                    = 1.30

+  INF_VERSION                    = 0x00010005

   BASE_NAME                      = SecMain

   FILE_GUID                      = 57d02d4f-5a5d-4bfa-b7d6-ba0a4d2c72ce

   MODULE_TYPE                    = SEC

-- 
2.45.0