diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2024-06-07 10:15:18 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-06-10 08:44:48 +0000 |
| commit | 7bcd49edd0a1daa23f8e910d0082abb0f9f2119d (patch) | |
| tree | f3f540b6394799f5809d7c220d5c20bb9d687793 | |
| parent | 059676e4faef29ebe50549ed9cd80b6f68a0d556 (diff) | |
| download | edk2-7bcd49edd0a1daa23f8e910d0082abb0f9f2119d.zip edk2-7bcd49edd0a1daa23f8e910d0082abb0f9f2119d.tar.gz edk2-7bcd49edd0a1daa23f8e910d0082abb0f9f2119d.tar.bz2 | |
ArmVirtPkg: Revert "Use dynamic PCD to set the SMCCC conduit"
This reverts commit c98f7f75508912c086158892fc56b0c3b85abcf1, which is
no longer needed: the SMCCC conduit will be converted back to being
hardcoded, as PrePi based ArmVirtPkg build cannot support dynamic PCDs,
and falling back to patchable PCDs does not work either.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
| -rw-r--r-- | ArmVirtPkg/ArmVirtCloudHv.dsc | 3 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemu.dsc | 4 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtXen.dsc | 2 | ||||
| -rw-r--r-- | ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c | 2 | ||||
| -rw-r--r-- | ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf | 1 |
6 files changed, 0 insertions, 14 deletions
diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index d5055a0..5cb2a60 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -201,9 +201,6 @@ [PcdsDynamicHii]
gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS
-[PcdsPatchableInModule.common]
- gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
-
################################################################################
#
# Components Section - list of all EDK II Modules needed by this Platform
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index fa4f0ca..95c5fcc 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -309,10 +309,6 @@ gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
- # whether to use HVC or SMC to issue monitor calls - this typically depends
- # on the exception level at which the UEFI system firmware executes
- gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
-
#
# TPM2 support
#
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index a1bafba..7d41f28 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -211,8 +211,6 @@ gArmTokenSpaceGuid.PcdFdBaseAddress|0x0
gArmTokenSpaceGuid.PcdFvBaseAddress|0x0
- gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
-
[PcdsDynamicDefault.common]
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 1505709..3689106 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -120,8 +120,6 @@ gArmTokenSpaceGuid.PcdFdBaseAddress|0x0
gArmTokenSpaceGuid.PcdFvBaseAddress|0x0
- gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
-
[PcdsDynamicDefault.common]
gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0
diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c index 3c80f05..7ab4aa2 100644 --- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c @@ -18,8 +18,6 @@ #include <Library/FdtSerialPortAddressLib.h>
#include <libfdt.h>
-#include <Chipset/AArch64.h>
-
#include <Guid/EarlyPL011BaseAddress.h>
#include <Guid/FdtHob.h>
diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf index a38b89c1..e9a34b6 100644 --- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf @@ -45,7 +45,6 @@ [Pcd]
gArmTokenSpaceGuid.PcdFvBaseAddress
- gArmTokenSpaceGuid.PcdMonitorConduitHvc
gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## SOMETIMES_PRODUCES
gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress
|