2023-03-22 08:33:31 +00:00
|
|
|
From 6794db451b25dbd81ad52e7c6d4b36db1cafe400 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
|
|
Date: Mon, 6 Mar 2023 08:03:50 +0100
|
|
|
|
|
Subject: Revert "ArmVirtPkg/ArmVirtQemu: enable initial ID map at early boot"
|
2023-02-06 07:27:22 +00:00
|
|
|
|
2023-03-22 08:33:31 +00:00
|
|
|
This reverts commit 07be1d34d95460a238fcd0f6693efb747c28b329.
|
2023-02-06 07:27:22 +00:00
|
|
|
---
|
2023-03-22 08:33:31 +00:00
|
|
|
ArmVirtPkg/ArmVirtQemu.dsc | 15 +++------------
|
2023-02-06 07:27:22 +00:00
|
|
|
ArmVirtPkg/ArmVirtQemu.fdf | 2 +-
|
2023-03-22 08:33:31 +00:00
|
|
|
2 files changed, 4 insertions(+), 13 deletions(-)
|
2023-02-06 07:27:22 +00:00
|
|
|
|
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
2023-03-22 08:33:31 +00:00
|
|
|
index bd0b2c8ba0..e3f8842829 100644
|
2023-02-06 07:27:22 +00:00
|
|
|
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
|
|
|
|
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
2023-03-22 08:33:31 +00:00
|
|
|
@@ -65,6 +65,8 @@
|
2023-02-06 07:27:22 +00:00
|
|
|
QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf
|
|
|
|
|
QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
|
|
|
|
|
|
|
|
|
|
+ ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
|
|
|
|
|
+
|
|
|
|
|
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
|
|
|
|
|
VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
|
|
|
|
|
|
2023-03-22 08:33:31 +00:00
|
|
|
@@ -92,12 +94,6 @@
|
2023-02-06 07:27:22 +00:00
|
|
|
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
|
|
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
-[LibraryClasses.AARCH64]
|
|
|
|
|
- ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf
|
|
|
|
|
-
|
|
|
|
|
-[LibraryClasses.ARM]
|
|
|
|
|
- ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
|
|
|
|
|
-
|
|
|
|
|
[LibraryClasses.common.PEIM]
|
|
|
|
|
ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
|
|
|
|
|
|
2023-03-22 08:33:31 +00:00
|
|
|
@@ -335,12 +331,7 @@
|
2023-02-06 07:27:22 +00:00
|
|
|
ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
|
|
|
|
MdeModulePkg/Core/Pei/PeiMain.inf
|
|
|
|
|
ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
|
|
|
|
- ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {
|
|
|
|
|
- <LibraryClasses>
|
|
|
|
|
-!if $(ARCH) == AARCH64
|
|
|
|
|
- ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
|
|
|
|
|
-!endif
|
|
|
|
|
- }
|
|
|
|
|
+ ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
|
|
|
|
|
ArmPkg/Drivers/CpuPei/CpuPei.inf
|
|
|
|
|
|
|
|
|
|
!if $(TPM2_ENABLE) == TRUE
|
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
|
|
|
|
|
index 764f652afd..c61ed36d89 100644
|
|
|
|
|
--- a/ArmVirtPkg/ArmVirtQemu.fdf
|
|
|
|
|
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
|
|
|
|
|
@@ -107,7 +107,7 @@ READ_LOCK_STATUS = TRUE
|
|
|
|
|
INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
|
|
|
|
INF MdeModulePkg/Core/Pei/PeiMain.inf
|
|
|
|
|
INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
|
|
|
|
- INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf
|
|
|
|
|
+ INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
|
|
|
|
|
INF ArmPkg/Drivers/CpuPei/CpuPei.inf
|
|
|
|
|
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
|
|
|
|
|
|
|
|
|
|
--
|
2023-03-22 08:33:31 +00:00
|
|
|
2.39.1
|
2023-02-06 07:27:22 +00:00
|
|
|
|
