170 lines
8.1 KiB
Diff
170 lines
8.1 KiB
Diff
From b0f503de63b9f177d5457956025567806066bfb3 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Fri, 2 Dec 2022 14:10:07 +0100
|
|
Subject: [PATCH 29/32] OvmfPkg/DebugLibIoPort: use Rom version for PEI
|
|
|
|
This variant does not use global variables.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Tested-by: Tom Lendacky <thomas.lendacky@amd.com>
|
|
Acked-by: Ard Biesheuvel <ardb@kernel.org>
|
|
(cherry picked from commit e59747bd8246135faeecc18879d62db66a6acfc2)
|
|
---
|
|
OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ++--
|
|
OvmfPkg/Bhyve/BhyveX64.dsc | 4 ++--
|
|
OvmfPkg/Microvm/MicrovmX64.dsc | 4 ++--
|
|
OvmfPkg/OvmfPkgIa32.dsc | 4 ++--
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++--
|
|
OvmfPkg/OvmfPkgX64.dsc | 4 ++--
|
|
.../PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf | 2 +-
|
|
7 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
index 05908a72270f..ea755afbab82 100644
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
@@ -244,7 +244,7 @@ [LibraryClasses.common.PEI_CORE]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
|
|
@@ -260,7 +260,7 @@ [LibraryClasses.common.PEIM]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
|
|
diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
|
|
index e3bb367b6bf6..befec670d4f3 100644
|
|
--- a/OvmfPkg/Bhyve/BhyveX64.dsc
|
|
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
|
|
@@ -265,7 +265,7 @@ [LibraryClasses.common.PEI_CORE]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
|
|
@@ -281,7 +281,7 @@ [LibraryClasses.common.PEIM]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
|
|
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
|
|
index 3444304d0e46..97339d48a5ef 100644
|
|
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
|
|
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
|
|
@@ -292,7 +292,7 @@ [LibraryClasses.common.PEI_CORE]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
|
|
@@ -308,7 +308,7 @@ [LibraryClasses.common.PEIM]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
index 9c0fb7d545b8..72e623a65a38 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
@@ -294,7 +294,7 @@ [LibraryClasses.common.PEI_CORE]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
|
|
@@ -310,7 +310,7 @@ [LibraryClasses.common.PEIM]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
index 8b93437044e7..55ceb5c3420b 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
@@ -300,7 +300,7 @@ [LibraryClasses.common.PEI_CORE]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
|
|
@@ -316,7 +316,7 @@ [LibraryClasses.common.PEIM]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
index 8c9162db1743..6cef37c10822 100644
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
@@ -318,7 +318,7 @@ [LibraryClasses.common.PEI_CORE]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf
|
|
@@ -335,7 +335,7 @@ [LibraryClasses.common.PEIM]
|
|
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
!else
|
|
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
!endif
|
|
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
|
|
ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
|
|
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
index 8f721d249dd5..c89b1571bad8 100644
|
|
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
@@ -16,7 +16,7 @@ [Defines]
|
|
FILE_GUID = CEB0D9D3-328F-4C24-8C02-28FA1986AE1B
|
|
MODULE_TYPE = BASE
|
|
VERSION_STRING = 1.0
|
|
- LIBRARY_CLASS = DebugLib|SEC
|
|
+ LIBRARY_CLASS = DebugLib|SEC PEI_CORE PEIM
|
|
CONSTRUCTOR = PlatformRomDebugLibIoPortConstructor
|
|
|
|
#
|
|
--
|
|
2.38.1
|
|
|