diff options
| author | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-08-27 16:26:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 16:26:54 +0000 |
| commit | 1bf1b9cc9b55fde85d44a22f829cf09f41a974ab (patch) | |
| tree | feb30fce2c8f5cdba62210d726a7f3ad2ab7035b /ArmVirtPkg/ArmVirt.dsc.inc | |
| parent | 911a62f1327a7a689e3d061efc4e62508521d48d (diff) | |
| parent | b2a431868c4ae0ad99def0a504d2fe097e16cd4f (diff) | |
| download | edk2-1bf1b9cc9b55fde85d44a22f829cf09f41a974ab.tar.gz | |
Merge branch 'master' into dependabot/github_actions/github/issue-labeler-3.4dependabot/github_actions/github/issue-labeler-3.4
Diffstat (limited to 'ArmVirtPkg/ArmVirt.dsc.inc')
| -rw-r--r-- | ArmVirtPkg/ArmVirt.dsc.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 7044790a1e..3462adf9b6 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -114,7 +114,7 @@ PlatformPeiLib|ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
MemoryInitPeiLib|ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf
- ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
+ ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
# ARM PL031 RTC Driver
RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
@@ -296,6 +296,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
[PcdsFixedAtBuild.common]
+ gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
+
!ifdef $(FIRMWARE_VER)
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
!endif
|