Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ovmf for openSUSE:Factory checked in 
at 2026-06-05 14:55:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ovmf (Old)
 and      /work/SRC/openSUSE:Factory/.ovmf.new.2375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ovmf"

Fri Jun  5 14:55:50 2026 rev:138 rq:1357150 version:202605

Changes:
--------
--- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes        2026-05-06 
19:18:23.882323370 +0200
+++ /work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes      2026-06-05 
14:55:56.653497716 +0200
@@ -1,0 +2,484 @@
+Tue Jun  2 10:13:24 UTC 2026 - Richad Lyu <[email protected]>
+
+- Update to edk2-stable202605
+  - Patches (git log --oneline --date-order 
edk2-stable202602..edk2-stable202605)
+    b03a21a63e3b UefiCpuPkg: Remove the absolute address jump in LoongArch 
exception handler
+    e6863d9cb987 MdePkg: Disable AuditOnly Mode for Spell Check
+    6f73fbea9778 MdePkg: Fix Spelling Errors in Comments
+    27f83abf1b65 .pytool: Update cspell Allowed Words
+    b5d4a2c4789d MdePkg,MdeModulePkg: Fix Spelling Error in Udf Definitions
+    1efbb315fd43 MdePkg: Fix Spelling Errors in CXL Definitions
+    627860407ae1 MdePkg: Fix Spelling Errors in HiiImageDecoder Definitions
+    4da6018ffe6e MdePkg: Fix Spelling Errors in IPMI Definitions
+    5981dfcb5f49 MdePkg: Fix Spelling Error in DriverConfiguration2 Definitions
+    5aaf451f8b67 MdePkg: Fix Spelling Errors in ACPI Definitions
+    efd3635d901e MdePkg: Fix Spelling Error in ScsiIo Definitions
+    f3b29f03c4d6 MdePkg: Fix Spelling Error in Cper Definitions
+    2ced4c80342a MdePkg: Fix Spelling Error in Hash Definitions
+    208454c51def MdePkg: Fix Spelling Error in Nvme Definitions
+    bf5ed9cc551b Global: Fix Spelling Errors in PCI/PCIe Definitions
+    e6f401761a73 MdePkg: Fix Spelling Errors in SmBios Definitions
+    7c440a7a2b55 MdePkg,MdeModulePkg: Fix Spelling Errors in Atapi Definitions
+    81b7c2912bd6 MdePkg,SecurityPkg: Fix Spelling Errors in TCG/TPM Definitions
+    4e5672043bd5 ManageabilityPkg: add configurable KCS status-check timeout 
PCD
+    441873c2a987 SecurityPkg/SecureBootVariableLib: Cleanup debug print 
readability
+    8add400a8be8 MdeModulePkg: Cleanup debug print readability
+    5caf4c6aeb4a MdeModulePkg,MdePkg: Send I/O without FUA if necessary
+    ee58614bbbb4 MdeModulePkg/ScsiDiskDxe: Check Write Caching and FUA support
+    b8df7d9c8e1e ArmVirtPkg/ArmPlatformLibQemu: Support early ID map on LPA2 
capable CPUs
+    d73615b24ba4 Revert "ArmPlatformPkg,EmbeddedPkg,MdeModulePkg: Move 
RealTimeClockLib ..."
+    f3d49c80246d MdePkg/Include: Add missing ACPI EINJ structure
+    c00c1216ce7f ArmPkg/CpuDxe: Refuse to clear XN from device memory mappings
+    99d8c3710a0f ArmPkg/CpuDxe: Drop GCD system memory check from 
MemoryAttribute protocol
+    7ab771ddcf8d .github: Remove SignedCapsulePkg
+    1c1f858a4df0 .pytool: Remove SignedCapsulePkg
+    a3c4fd772a17 .azurepipelines/templates/pr-gate-build-job.yml: Remove 
SignedCapsulePkg
+    111a799abd83 Maintainers.txt: Remove SignedCapsulePkg
+    c00e8d0bcddf SignedCapsulePkg: Remove package
+    6d4e97380784 NetworkPkg/DnsDxe: Refactor answer loop to for in 
ParseDnsResponse
+    ccc95703cd8b NetworkPkg/Ip4Dxe: Fix missing Status check on 
Ip4Cfg2->SetData call
+    f1f89f454cd8 ShellPkg/UefiShellLevel3: Lower indentation level in 
MainCmdXXX()
+    8b5c970c55a7 ShellPkg/Help: Extract PrintMatchingHelp() function
+    27c785b0df7f ShellPkg/UefiShellLevel3: Extract ProcessFileList() function
+    014d8fb941f8 ShellPkg/UefiShellLevel3: Extract MainCmdXXX() function
+    49ba46ec0ae6 ShellPkg/UefiShellLevel3: Return if ShellCommandLineParse() 
failed
+    a219f8cfc541 ShellPkg/Help: Free package on all paths
+    899b8b8550f8 ShellPkg/Type: Factorize character display
+    680ee2e3e9b1 ShellPkg/Cls: Factorize color parsing
+    68662fd712b9 ShellPkg: Add 'cxl' command
+    d9c842477ec8 OvmfPkg: Include CxlDxe
+    a87c9f062170 MdeModulePkg: Add CxlDxe driver
+    6afdf4e7fbff MdeModulePkg: Add CxlIo.h protocol
+    2a8ba80f276d MdePkg: Add CDAT structure definitions
+    780a9c2dfccb MdePkg: Add Data Object Exchange interface
+    50537c6a1171 OvmfPkg/OvmfXen: Remove SEC source level debug for Xen
+    66820c9ace07 OvmfPkg: FSBClock moved to FixedAtBuild for platforms except 
Xen
+    c801f959bba9 ShellPkg/UefiShellLevel1: Lower indentation level in 
MainCmdXXX()
+    c50e5fe946ad ShellPkg/UefiShellLevel1: Extract MainCmdXXX() function
+    e8036a9fbbe4 ShellPkg/UefiShellLevel1: Return if ShellCommandLineParse() 
failed
+    d8b163508842 DynamicTablesPkg: add Hest table generator
+    d9256a20ffb1 DynamicTablesPkg: add X64 objects for error sources
+    829c70b9efe0 DynamicTablesPkg: add common objects for common error sources
+    6bd553cc35fd MdeModulePkg: Remove duplicate library class in dsc file
+    0bc238d06684 MdePkg/AdapterInformation: Add CDAT adapter information type
+    3b899d2e586c MdeModulePkg/DxeCapsuleLibFmp: Tolerate EFI_ALREADY_STARTED 
in LockVariable
+    5acaac4f322d NetworkPkg/Ip4Dxe: Reject IPv4 addresses ending with dot
+    31ea9bcc70b0 ArmVirtPkg: Kvmtool: Init Arm CCA HOBs in PlatformPeim()
+    9c05ec80a285 ArmVirtPkg: Add a helper function to initialise Arm CCA HOBs
+    f8ca1db593f9 ArmVirtPkg: Add NULL instance of ArmCcaInitPeiLib
+    15cf30827650 ArmVirtPkg: Add library for Arm CCA initialisation in PEI
+    eee6ed8b117f OvmfPkg/XenBusDxe: Fix an error message
+    0d6750b88cbc OvmfPkg/XenPlatformPei: Remove call to XenHypercallLibInit
+    c4cdc1794a51 OvmfPkg/XenHypercallLib: Remove unused HobLib
+    b6480f6270b3 ArmVirtPkg: Add a helper to check protected MMIO address
+    1ae23a7acd13 ArmVirtPkg: Add Null instance of ArmCcaLib
+    39ff71df13cb ArmVirtPkg: Add library for Arm CCA helper functions
+    7c0fed45459b ArmVirtPkg: Add GUID HOBs to cache Realm IPA width and 
execution state
+    351dfdb3836f MdeModulePkg: Remove duplicate procotols guid in INF files
+    7d87a9d339c8 UefiPayloadPkg: Remove duplicate library and file name in INF 
file
+    c86451e79bce UefiCpuPkg: Remove duplicate libraries in INF files
+    34c7871fec1a SourceLevelDebugPkg/DebugAgent: Remove duplicate library in 
INF file
+    25540b069f9f SecurityPkg: Remove duplicate file name in INF file
+    687d8049f574 ShellPkg/Shell: Remove duplicate Guid in INF file
+    42364d6c6f94 OvmfPkg/Sec: Remove duplicate PCD in INF file
+    6d4f24a74900 NetworkPkg/GoogleTest: Remove duplicate file name in INF file
+    35102d932fef IntelFsp2WrapperPkg: Remove duplicate library class in INF 
file
+    1c39524aec65 EmbeddedPkg: Remove duplicate procotol in INF file
+    482b4bf0a51a EmulatorPkg/Host: Remove duplicate procotol in INF file
+    71bf0d807dc2 ArmPkg/ArmGicDxe: Remove duplicate library in INF file
+    c8833afa7a46 MdeModulePkg/NvmExpressDxe: Mark CDW10/CDW11 valid for Format 
and Sanitize
+    ae2d2d76c1b9 ArmPkg,MdePkg,MdeModulePkg: change ArmFfaLibGetVersion() with 
whole version
+    50349c5e07e7 ArmPkg/Library: optimise StandaloneMmMmuLib with FF-A v1.3
+    03a07cb0f5e9 OvmfPkg/IntelTdx: only add UI to NCCFV
+    99148f1df884 DynamicTablesPkg: AcpiIortLibArm: Support SMMUv3 revision 5
+    56a250ad9f84 DynamicTablesPkg: AcpiIortLibArm: Support IORT revision 6
+    112a43a92d92 RedfishPkg/RedfishHttpDxe: Improve RedfishHttpOperation error 
handling
+    3449c60bab69 BaseTools: Add GENFWHII_FLAGS to fix VS2026 GenFw build issue
+    2f3883dd5912 NetworkPkg/HttpBootDxe: Add all events to 
HttpBootHttpCallback()
+    0e6f016032ed MdePkg/IndustryStandard: add LoongArch IOVT structures
+    53783077e291 RedfishPkg/RedfishDiscoverDxe: Do not require TCP6 if IPv6 
HTTP off
+    ef745f258c03 .github/workflows: Enable CodeQL on ManageabilityPkg
+    19d4bdefde67 ManageabilityPkg: Add ManageabilityPkg CI yaml
+    b270eb225634 .pytool: Add ManageabilityPkg to CI
+    b60d8dedca3a .azurepipelines: Add ManageabilityPkg the gate keeper
+    4906829f64b3 .github: Add ManageabilityPkg to git issue and bug report
+    24b8d2a61c28 Maintainers.txt: Add maintainer and reviewers for 
ManageabilityPkg
+    c9c309146e49 ManageabilityPkg: Initial version of ManageabilityPkg
+    962c1f2a060e StandaloneMmPkg: Fix possible infinite loop due invalid hob
+    b6c1c1afdc51 BaseTools/PatchCheck.py: Skip length check for Co-authored-by 
line
+    793eee379562 MdePkg/Acpi66.h: Fix comments for SRAT structure types
+    92e662f1aa8f MdePkg/Acpi65|66.h: Add Generic Port Affinity structure and 
flags for SRAT
+    7e9eb04d71ad CryptoPkg/Library/MbedTlsLib: Update mbedtls submodule to 
v3.6.6
+    fcac2f3a6dfc MdePkg: Add macros for ARM Processor Error Section in Cper.h
+    2eefbc5d34e4 MdePkg: Update YAML to ignore specific ECC files/errors
+    1fd1e30a525e ArmVirtPkg: ArmCcaRsiLib: Add RSI Features support
+    8b2e33476d29 ArmVirtPkg: ArmCcaRsiLib: Add an interface to get an 
attestation token
+    896c0b58035a ArmVirtPkg: ArmCcaRsiLib: Add an interface to make a RSI Host 
Call
+    74a04882d6cf ArmVirtPkg: ArmCcaRsiLib: Add interfaces to get/extend REMs
+    2029a69a0b00 ArmVirtPkg: ArmCcaRsiLib: Add interfaces to manage the Realm 
IPA state
+    66d18535730b ArmVirtPkg: Add Arm CCA Realm Service Interface Library
+    4d9bf36047e4 MdePkg/IndustryStandard: Add Arm CCA RSI FID definitions
+    12e26dc213cb ShellPkg/TimeDate: Extract GetTimeZoneFromString() helper
+    c062ff8487d2 ShellPkg/TimeDate: Extract PrintDaylight() helper
+    a366d6f8fe6c ShellPkg/TimeDate: Extract PrintTime() helper
+    0f69afa29536 ShellPkg/TimeDate: Extract GetCurrentTime() helper
+    be6ce32cd011 ShellPkg/Ls: Extract PrintLsOutputCurr() function
+    636761d3cab4 ShellPkg/Ls: Lower PrintLsOutputRec() indentation level
+    da54ab306a62 ShellPkg/Ls: Extract PrintLsOutputRec() function
+    08bc059570d8 ShellPkg/Ls: Remove unused TimeZone parameter
+    78b550f43d2f ShellPkg/Ls: Hard-code number of files if none found
+    273edd9e0147 ShellPkg/Ls: Extract GetCorrectedPath() function
+    9171edd4d446 ShellPkg/Ls: Move FileMetaArg closing logic
+    c45e930ad581 ShellPkg/Ls: Extract UpdateFileLocalTime() function
+    6829285f88a6 ShellPkg/Rm: Extract DeleteDirectory() function
+    420dab0b24c4 ShellPkg/UefiShellLib: Add IsDotOrDotDot() function
+    4afe895a7707 ShellPkg/SerMode: Add ValidDataBits() function
+    65288416dfbe ShellPkg/SerMode: Add GetStopBits() function
+    5e8b0d6de5be ShellPkg/SerMode: Lower indentation level in DisplaySettings()
+    a5e74cdedb2b ShellPkg/SerMode: Add GetParityType() function
+    06372c8df1c1 ShellPkg/SerMode: Add name conversion arrays for parity/stop 
bits
+    e146b012f542 MdePkg/ArmFfaMemMgmtLib: Set NS bit support in FFA_FEATURES 
query
+    ddc7ed1deeb0 MdeModulePkg/Library: introduce ArmFfaConsoleDebugLib
+    2fb6e81c06b6 RedfishPkg/ConfigHandler: Remove [Depex] section from INF file
+    96484a32b1e5 OvmfPkg/VirtioBlkDxe: protect SynchronousRequest against 
interrupts
+    87cfc60f2066 MdeModulePkg/Library: ArmFfaLib: add mapping ARM_FFA_RET_RETRY
+    5e2bea1a7453 BaseTools: Add missing machine types while dumping Option Rom
+    0f2dc7558713 MdeModulePkg: Don't Allow Guard Pages to Cross Bin Boundaries
+    9b34b680500b .mergify/config.yml: Use rebase for update_method
+    b5f11993237d EmbeddedPkg: Add missing FreeAlignedPages() implementation
+    691b92fe05cd UefiCpuPkg/ArmMmuLib: Introduce 
ArmCcaSetMemoryProtectionAttribute()
+    90f40e654c1c UefiCpuPkg/ArmMmuLib: Handle Realm unprotected bit
+    5bdf8acc1384 MdePkg: Add helper function to detect RME
+    c31b880bd21c MdeModulePkg/NetworkCommon: Add PCD for USB network periodic 
timer
+    23eaf2d5292d UefiCpuPkg/SmmCpuFeaturesLib: Add Standalone MM file for AMD 
family
+    be4fc071eb01 BaseTools: Reject Inline Comments in tools_def
+    8e873a83b27e .pytool/SpellCheck: Provide ignored paths to cspell
+    30b1cb6cabb9 DynamicTablesPkg/FdtHwInfoParserLib: Update SmmuV3 DeviceId 
Valid flag
+    db38e5031a15 ShellPkg/AcpiView: Update MPAM table "MMIO size" field check
+    b249f5d50282 MdePkg: ArmLib: Drop DebugLib Dependency
+    87148bcc25bb Global: Move ArmLib to MdePkg
+    63295871676d ReadMe.rst: Update CI pipeline badges
+    0dddd6549d8d MdePkg/IndustryStandard:: Add ACPI 6.6 extension for NUMA 
ACPI Tables
+    3971a4dba93f MdeModulePkg/NvmExpressDxe: Clear NSID to 0 for sanitize 
command
+    0d44f421a58f BaseTools: tools_def: Align X64 CLANGDWARF and CLANGPDB Defs
+    192b5a92b36b BaseTools: tools_def: Canonicalize CLANGDWARF Defs
+    3b0deb5e7941 EmbeddedPkg/PrePiLib: Prevent overread with FFS size macros
+    9989454219e7 EmulatorPkg/SecPeiServicesLib: Prevent overread with 
available size macros
+    7e0b85e03bcc StandaloneMmPkg/Core: Return when processing malformed DEPEX
+    4d15c942fb11 ReadMe.rst: Fix header formatting, path separators, and 
grammar
+    d4a6e02659bf BaseTools/Conf: Add missing CLANGDWARF OBJCOPY_FLAGS
+    d45ce5aceabf EmulatorPkg: Clear DLINK_XIPFLAGS
+    e5997b818060 EmulatorPkg: Add Windows CLANGPDB CI
+    2a5f6b22b900 TcgTpmPkg: Update Readme.md to use markdown code block syntax
+    f5c6c98d89e4 OvmfPkg/IgvmSecureBootDxe: Remove CustomMode code
+    b2a149cf97e4 UefiCpuPkg: ArmMmuLib: Check if Block Split Following Page 
Alloc
+    5107351f77b5 TcgTpmPkg: fix build failure of TpmLib with CLANGDWARF
+    ec1f28670a52 BaseTools: add --apply-dynamic-relocs option for AARCH64 
CLAGNDWARF
+    11a89ec0305f IntelFsp2Pkg/FspSecCore/Vtf0: NASM and Python 3 fixes
+    76406ef11962 ShellPkg/UefiShellDriver1: Remove unused Status
+    c14647a48331 ShellPkg/UefiShellDriver1: Flatten some functions
+    1ab251c77017 ShellPkg/UefiShellDriver1/Drivers: Fix memory leaks
+    becbdb4e2766 ShellPkg/UefiShellDriver1: Lower indentation level in 
MainCmdXXX()
+    4de99ebb926a ShellPkg/UefiShellDriver1: Extract MainCmdXXX() function
+    51cdb08cdb72 ShellPkg/UefiShellDriver1: Return if ShellCommandLineParse() 
failed
+    cfcb4eee914e ShellPkg/UefiShellDriver1: Fix memory leaks
+    4fae655881e3 OvmfPkg/AmdSevX64: Expose DEBUG_TO_MEM as a build option
+    050b26bb5418 OvmfPkg/MicrovmX64: Expose DEBUG_TO_MEM as a build option
+    07fa02d26710 OvmfPkg/OvmfPkgIa32X64: Expose DEBUG_TO_MEM as a build option
+    bd8ec2128077 ShellPkg/AcpiView: Avoid mutating HEST hardware bank count 
during parse
+    35c03c1c9f53 BaseTools: Ecc: Update to ANTLR 4.13.2
+    9b676f7cc2d1 BaseTools: Ecc: Use SPDX in AutoGen Template
+    229600664e26 BaseTools: Ecc: Drop ANTLR 3 Support
+    e3e5c415988d OvmfPkg/IgvmSecureBootDxe: enable CustomMode only if needed
+    75ea215310cd OvmfPkg/EnrollDefaultKeys: do not check VendorKeys
+    0a7ed7ed3457 OvmfPkg/EnrollDefaultKeys: do not require CustomMode
+    3c01a11daae2 OvmfPkg: set PcdRequireSelfSignedPk to FALSE
+    3ed3b7a4aeaf OvmfPkg/BaseMemEncryptSevLib: IGVM data HOB ranges are 
prevalidated
+    4c8717de1696 OvmfPkg: Page align sections of DXE and UEFI images
+    ac2316df3ed4 OvmfPkg/LoongArchVirt: Move FirmwarePerformancePei to PEI 
driver region
+    0fc588ddd278 OvmfPkg/LoongArchVirt: Enable FPDT for LoongArch OVMF platform
+    00a8e3b20f71 OvmfPkg/LoongArchVirt: Fix the misuse issue of 
ExtractGuidedSectionLib
+    b3fdc0994db6 CryptoPkg: Add digest-based RSA-PSS sign and verify APIs
+    f1fc41cff2a2 SecurityPkg: Tcg2AcpiFfa: Polish revision checks for TPM2 
table
+    a270773cce47 SecurityPkg: Tcg2AcpiFfa: Fix endianness of partition ID
+    c60df38f1071 SecurityPkg: Tcg2AcpiFfa: Remove Tcg2PhysicalPresenceLib from 
dependencies
+    268266d8dcbe RedfishPkg/PlatformConfig: Delete a few debug messages
+    56b1ab8ca30f NetworkPkg/HttpBootDxe: Print TLS errors on screen during 
HTTP boot
+    b7cf7e465c40 BaseTools: Only check for GCC prefixes when targeting
+    18d0c3596e93 DynamicTablesPkg: handle missing 'iommu-map' in root complex 
parser
+    ebe7fab41ec8 ArmVirtPkg: Kvmtool: Only install IORT if ITS is present
+    87e486f622c5 BaseTools: Enable 4k alignment for tool chains
+    4eb86f009d93 MdePkg: Added several mock libraries for google test
+    d68752de91db MdeModulePkg: Added several mock libraries for google test
+    e9f03fca2859 CryptoPkg: Added MockBaseCryptLib for google test
+    0a0919607ceb OvmfPkg/PlatformInitLib: redefine low memory
+    d2e5c5781e27 UefiCpuPkg/MpInitLib: Skip ucode rev dump if not loaded in 
the library
+    83060dd335dc NetworkPkg/UefiPxeBcDxe: Add missing Token.Context 
initialization
+    233eddb8e30d BaseTools/Plugin: Add lcov error tolerance for vendored 
source trees
+    56b98b3525c7 Maintainers.txt: Remove Chasel Chiu
+    f69f043d0574 .azurepipelines: Add CLANGPDB Windows CI
+    c4d29cb62187 ShellPkg/UefiHandleParsingLib: support handle list growth
+    b989871c8792 NetworkPkg: Reset DHCP Service Binding IO Status on Stop
+    b9c072aad65a UnitTestFrameworkPkg: Allow platform DSC to override 
sanitizer and coverage
+    ce0bdc3118f2 ArmVirtPkg/ArmVirtQemu: Expose DEBUG_TO_MEM as a build option
+    ef23e3c9e726 BaseTools: Enable control flow guard for Windows builds
+    4e0376c48b17 BaseTools: Suppress C4028 warning to support older VS 
toolchain builds
+    0049ac1793c4 MdeModulePkg: VariableSmmRuntimeDxe: Fix MM communicate v3 
buffer sizing
+    04b20705cef9 Maintainers.txt: Add Mike Beaton as reviewer to MdeModulePkg
+    0d0cac40e09b Maintainers.txt: Add Mike Beaton as reviewer of NetworkPkg
+    af1ae393d0b6 UefiCpuPkg/MpLib: Change print level for "5-Level Paging ="
+    183b578ec6b4 MdePkg: Ignore FdtLib.h for ECC
+    1574cd37a2ab MdePkg/BaseFdtLib: Header style update to FdtOverlayApply and 
FdtStrerror
+    4afb3886396a MdePkg/BaseFdtLib: FdtGetName, FdtGetPath
+    74a65f6b914d MdePkg/BaseFdtLib: Implement new libfdt wrappers
+    defbd14d6373 Revert "MdeModulePkg/PciBusDxe: Degrade MEM64 to PMEM64..."
+    260b91a352b8 MdeModulePkg/Core: Validate DXE event signature before usage
+    1bd61a940994 MdeModulePkg/SpiNorFlashJedecSfdp: Limit debug output
+    e7ffbde9ad82 UefiCpuPkg/ArmMmuLib: DEBUG_VERBOSE -> DEBUG_PAGING
+    5dc31efc427b UefiCpuPkg/CpuDxe: DEBUG_VERBOSE -> DEBUG_PAGING
+    3d6453f515cd OvmfPkg/BaseMemEncryptSevLib: DEBUG_VERBOSE -> DEBUG_PAGING
+    939de47d12ee MdePkg/DebugLib: add DEBUG_PAGING
+    a7908f214dd4 UefiCpuPkg, OvmfPkg: Rename .asm files to .nasm.inc in 
ResetVector
+    97aa85de722d UnitTestFrameworkPkg: Align C++ sign compare
+    7b6b0784a793 UnitTestFrameworkPkg/Test/GoogleTest/Sample: Add 0 tests
+    4018823b6399 OvmfPkg/LoongArchVirt: enable qemu uefi variable store support
+    644e5790cdc5 OvmfPkg/VirtMmCommunicationDxe: enable loongarch64
+    e98e311062f2 OvmfPkg/LoongArchVirt: Add Secure Boot key layout scaffolding
+    8d7ecf127721 OvmfPkg/LoongArchVirt: Add Secure Boot support
+    ff2543960090 IntelFsp2Pkg/FspSecCore: Do not hang when bootloader IDT is 
larger
+    819af4cd11f4 IntelFsp2Pkg/FspSecCore: Allocate correct number of IDT 
entries on stack
+    8c50e656c088 MdeModulePkg: : revert EndofDxeEvent TPLs to TPL_NOTIFY for 
FPDT
+    a4a7346cf450 StandaloneMmPkg Core: Check PE section finding status
+    fc13220238df MdeModulePkg/PeiCore: Accept MemoryDiscoveredPpi from SecCore
+    0fe6b755f246 ArmPkg,MdePkg: Add an ASM function to read register AIDR_EL1
+    6ae3cc5d5e88 UefiCpuPkg: Consume Public Page Table Definitions
+    530efa6742b9 MdePkg: Make X64 Page Table Definitions Public
+    e1103f7dcad6 NetworkPkg: Ip4Dxe/Ip6Dxe: Set SB notify to NULL after event 
close
+    6e39689c659d EmulatorPkg: Remove EmulatorPkg from CLANGPDB CI
+    469eb8dc53bb .azurepipelines,OvmfPkg: Remove RISCV64, LOONGARCH64 from 
CLANGPDB CI
+    2263bdf47f4d Global: Clone GCC to CLANGPDB CI
+    eca4173be905 .azurepipelines,OvmfPkg: Remove LOONGARCH64 builds from 
CLANGDWARF CI
+    81bab969df1b Global: Remove CLANGDWARF from PR gates
+    1184ca8ca382 Global: Clone GCC to CLANGDWARF CI
+    fae23133db5b .azurepipelines: Run non-package-build CI only in GCC and 
VS2022
+    f7548958e12d .azurepipelines: Switch to CI image which includes clang
+    11af818b3ea8 SecurityPkg: Refactor performance to use new PERF_FUNCTION_* 
measurements
+    aa02571f362c MdeModulePkg: Change EndofDxeEvent TPLs to TPL_CALLBACK
+    03e7c8c44f70 MdeModulePkg: Update performance measurements to use new perf 
macros
+    b074eb78b4fc MdeModulePkg/PciBusDxe: Add optional CRS retry for enumeration
+    ddcd0fd16705 DynamicTablesPkg/AmlLib: Fix refactor AmlCodeGenInvokeMethod 
API
+    23c1cb8c5e9e OvmfPkg/IntelTdx: Update README.md with missing build command
+    52bbcffe5481 OvmfPkg/OvmfPkgX64: Expose DEBUG_TO_MEM as a build option
+    8c298e11045e BaseTools: GenFfs/GenFv/GenSec: Fixing Warning 4319 from MSVC
+    0a3cb1cba064 Global: Rename default_linux_image to default_linux_container
+    0583e536b1c0 Global: Move Azure Pipelines vmImage defaults to defaults.yml
+    a6319874208e StandaloneMmPkg: Ensure section length alignment
+    f3f585bd42a0 ArmPkg/ArmStandaloneMmCoreEntryPoint: Ensure section length 
alignment
+    17cb2be38356 MdeModulePkg: IpmiCommandLib: Add IPMI mailbox declarations
+    beff015bc78e ArmPkg: Fix incorrect bit width mask for SP_EL0
+    2237cb9c51ad .azurepipelines/templates: Remove `echo new PATH` from 'Set 
PATH' task
+    6fb6ef54e759 SecurityPkg/Tcg2Smm: harden NVS/SMI state initialization
+    d372c29fabcf .azurepipelines: Fix the commented filename in two template 
files
+    a74be599355a .azurepipelines: Make 'Set PATH' step check Agent.OS rather 
than toolchain
+    e2b0e207f7b1 MdePkg/BaseLib: Add AsmReadFsBase and AsmWriteFsBase for 
X86-64
+    4e90b65e7b7b OvmfPkg/PlatformInitLib: Add SoftReserved memory type support
+    cb4cbc521640 DynamicTablesPkg/AmlLib: Adds API method returning method 
invocations
+    1774a34cc518 DynamicTablesPkg/AmlLib: Refactor AmlCodeGenInvokeMethod API
+    24ab1d8c51a5 MdePkg: Add AML method argument count limit definition
+    f4f781831ff3 Maintainers.txt: Add RiscV folder as well
+    0d13f96bd85b Maintainers.txt: Update Sunil's email ID
+    3517a8363976 MdePkg/BaseRngLib: Rename Riscv folder to RiscV
+    b5d168944729 OvmfPkg/RiscVVirt/PlatformPei: Do not set PcdTpmBaseAddress 
to garbage
+    4d38389e0f7c UefiCpuPkg/CpuMpPei: Support AMD GetProcessorCoreType
+    ff3693d345d9 UefiCpuPkg: Include AMD Cpuid.h
+    2c8ab5c4cfd1 MdePkg: Add AMD CPUID Extended Topology definition
+    309464ec9a8b OvmfPkg/Microvm: use MemDebugLogPeiCoreLib for PEIMs
+    8746e729f0f6 OvmfPkg/AmdSev: use MemDebugLogPeiCoreLib for PEIMs
+    cdee51da8e4c OvmfPkg: remove MemDebugLogPei from APRIORI
++++ 187 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/ovmf/ovmf.changes
++++ and /work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes
--- /work/SRC/openSUSE:Factory/ovmf/uefi-shell.changes  2026-02-26 
18:36:54.320244591 +0100
+++ /work/SRC/openSUSE:Factory/.ovmf.new.2375/uefi-shell.changes        
2026-06-05 14:55:56.673498543 +0200
@@ -1,0 +2,5 @@
+Tue Jun  2 10:12:42 UTC 2026 - Richard Lyu <[email protected]>
+
+- Update to edk2-stable202605 
+
+-------------------------------------------------------------------

Old:
----
  edk2-edk2-stable202602.tar.gz
  ovmf-ArmPkg-CpuDxe-Drop-GCD-system-memory-check-from-Memo.patch
  ovmf-ArmPkg-CpuDxe-Refuse-to-clear-XN-from-device-memory-.patch
  ovmf-OvmfPkg-RiscVVirt-Make-SecureBootDefaultKeysInit-dri.patch
  ovmf-OvmfPkg-RiscVVirt-PlatformPei-Do-not-set-PcdTpmBaseA.patch
  ovmf-Revert-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LP.patch
  ovmf-Revert-ArmPkg-UefiCpuPkg-fix-boot-failure-with-LPA2.patch
  ovmf-Revert-UefiCpuPkg-ArmMmuLib-Add-support-for-LPA2.patch
  ovmf-disable-ia32-firmware-piepic.patch

New:
----
  edk2-edk2-stable202605.tar.gz

----------(Old B)----------
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-      b5d168944729 
OvmfPkg/RiscVVirt/PlatformPei: Do not set PcdTpmBaseAddress to garbage
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:  - 
ovmf-ArmPkg-CpuDxe-Drop-GCD-system-memory-check-from-Memo.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-      99d8c3710a0f 
ArmPkg/CpuDxe: Drop GCD system memory check from MemoryAttribute protocol
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-      99d8c3710a0f 
ArmPkg/CpuDxe: Drop GCD system memory check from MemoryAttribute protocol
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:  - 
ovmf-ArmPkg-CpuDxe-Refuse-to-clear-XN-from-device-memory-.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-      c00c1216ce7f 
ArmPkg/CpuDxe: Refuse to clear XN from device memory mappings
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-      c00c1216ce7f 
ArmPkg/CpuDxe: Refuse to clear XN from device memory mappings
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:  - 
ovmf-OvmfPkg-RiscVVirt-Make-SecureBootDefaultKeysInit-dri.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-      a1abc3032cd2 
OvmfPkg/RiscVVirt: Make SecureBootDefaultKeysInit driver configurable
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-- Remove the 
following patches because they has been merged upstream.
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:  - 
ovmf-OvmfPkg-RiscVVirt-PlatformPei-Do-not-set-PcdTpmBaseA.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-      b5d168944729 
OvmfPkg/RiscVVirt/PlatformPei: Do not set PcdTpmBaseAddress to garbage
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-  b8df7d9c8e1e 
ArmVirtPkg/ArmPlatformLibQemu: Support early ID map on LPA2 capable CPUs. 
(bsc#1258870)
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:  - 
ovmf-Revert-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LP.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-  - 
ovmf-Revert-ArmPkg-UefiCpuPkg-fix-boot-failure-with-LPA2.patch
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-  - 
ovmf-Revert-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LP.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:  - 
ovmf-Revert-ArmPkg-UefiCpuPkg-fix-boot-failure-with-LPA2.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-  - 
ovmf-Revert-UefiCpuPkg-ArmMmuLib-Add-support-for-LPA2.patch
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-  - 
ovmf-Revert-ArmPkg-UefiCpuPkg-fix-boot-failure-with-LPA2.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:  - 
ovmf-Revert-UefiCpuPkg-ArmMmuLib-Add-support-for-LPA2.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-- Remove 
ovmf-disable-ia32-firmware-piepic.patch because upstream dropped GCC48.
  Old:/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-  - 
ovmf-Revert-UefiCpuPkg-ArmMmuLib-Add-support-for-LPA2.patch
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes:- Remove 
ovmf-disable-ia32-firmware-piepic.patch because upstream dropped GCC48.
/work/SRC/openSUSE:Factory/.ovmf.new.2375/ovmf.changes-    bdadb269e379 
BaseTools: Remove previously deprecated GCC48, GCC49 and GCC5
----------(Old E)----------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ovmf.spec ++++++
--- /var/tmp/diff_new_pack.wdGWpo/_old  2026-06-05 14:55:58.069556279 +0200
+++ /var/tmp/diff_new_pack.wdGWpo/_new  2026-06-05 14:55:58.069556279 +0200
@@ -27,7 +27,7 @@
 %endif
 
 Name:           ovmf
-Version:        202602
+Version:        202605
 Release:        0
 Summary:        Open Virtual Machine Firmware
 License:        BSD-2-Clause-Patent
@@ -59,12 +59,11 @@
 Source101:      gdb_uefi.py.in
 Patch1:         %{name}-gdb-symbols.patch
 Patch2:         %{name}-pie.patch
-Patch3:         %{name}-disable-ia32-firmware-piepic.patch
+# Bug 1267604 - ovmf: constructor function causes riscv VM boot failure
+Patch3:         
%{name}-Revert-UefiCpuPkg-BaseRiscV64CpuTimerLib-Add-constru.patch
 # Bug 1259122 - [16.1][Build 5.19][aarch64] openQA test fails in qemu - 
truncation screen issue appears in qemu boot manager
 Patch5:         
%{name}-MdeModulePkg-ConSplitterDxe-Set-default-ConOut-mode.patch
 Patch6:         %{name}-ignore-spurious-GCC-12-warning.patch
-# Bug 1255113 - Build Failure for RISC-V 64 When Secure Boot is Enabled Due to 
SecureBootDefaultKeysInit module
-Patch7:         
%{name}-OvmfPkg-RiscVVirt-Make-SecureBootDefaultKeysInit-dri.patch
 # Bug 1207095 - ASSERT [ArmCpuDxe] 
/home/abuild/rpmbuild/BUILD/edk2-edk2-stable202211/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c(333):
 ((BOOLEAN)(0==1))
 Patch8:         
%{name}-Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch
 # Bug 1205613 - L3: win 2k22 UEFI xen VMs cannot boot in xen after upgrade
@@ -80,20 +79,9 @@
 Patch13:        %{name}-UefiCpuPkg-Disable-EFI-memory-attributes-protocol.patch
 # Bug 1244218 - ovmf: non-deterministic .bin files (about unreproducible)
 Patch14:        %{name}-OvmfPkg-ArmVirtPkg-Keep-JSON-stack-cookie-files.patch
-# Bug 1258870 - ovmf: LPA2 support causing boot failure on AArch64
-Patch15:        
%{name}-Revert-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LP.patch
-Patch16:        
%{name}-Revert-ArmPkg-UefiCpuPkg-fix-boot-failure-with-LPA2.patch
-Patch17:        %{name}-Revert-UefiCpuPkg-ArmMmuLib-Add-support-for-LPA2.patch
-# Workaround for failing PEI boot on RISCV64 
(https://github.com/tianocore/edk2/issues/12206)
-Patch18:        
%{name}-Revert-UefiCpuPkg-BaseRiscV64CpuTimerLib-Add-constru.patch
-# https://github.com/tianocore/edk2/pull/12248
-Patch19:        
%{name}-OvmfPkg-RiscVVirt-PlatformPei-Do-not-set-PcdTpmBaseA.patch
 # Bug 1260358 - [SLES][16.1][Build33.1][x86_64][kvm] Fail to install uefi 
15-SP7 vm
 # Bug 1259826 - latest version of ovmf package dont support -kernel -initrd 
options
 Patch20:        
%{name}-Revert-OvmfPkg-X86QemuLoadImageLib-flip-default-for-.patch
-# Bug 1259640 - OVMF crashes when exiting from aarch64 GRUB
-Patch21:        
%{name}-ArmPkg-CpuDxe-Drop-GCD-system-memory-check-from-Memo.patch
-Patch22:        
%{name}-ArmPkg-CpuDxe-Refuse-to-clear-XN-from-device-memory-.patch
 BuildRequires:  bc
 BuildRequires:  cross-arm-binutils
 BuildRequires:  cross-arm-gcc%{gcc_version}
@@ -266,7 +254,7 @@
 "
 
 %if 0%{?suse_version} > 1320
-TOOL_CHAIN=GCC5
+TOOL_CHAIN=GCC
 %else
 echo `gcc -dumpversion`
 TOOL_CHAIN=GCC$(gcc -dumpversion|sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/')

++++++ uefi-shell.spec ++++++
--- /var/tmp/diff_new_pack.wdGWpo/_old  2026-06-05 14:55:58.109557933 +0200
+++ /var/tmp/diff_new_pack.wdGWpo/_new  2026-06-05 14:55:58.109557933 +0200
@@ -26,7 +26,7 @@
 %endif
 
 Name:           uefi-shell
-Version:        202602
+Version:        202605
 Release:        0
 Summary:        UEFI Shell built from EDK II project
 License:        BSD-2-Clause-Patent
@@ -57,8 +57,6 @@
 Source100:      ovmf-rpmlintrc
 Source101:      gdb_uefi.py.in
 Patch1:         ovmf-gdb-symbols.patch
-Patch2:         ovmf-pie.patch
-Patch3:         ovmf-disable-ia32-firmware-piepic.patch
 # Bug 1236009 - Build failure on Leap 15.5/15.6 due to unsupported GCC flag 
-mstack-protector-guard for aarch64 cross-compiler
 Patch10:        ovmf-Revert-Add-Stack-Cookie-Support-to-MSVC-and-GCC.patch
 BuildRequires:  bc
@@ -192,7 +190,7 @@
 export PYTHON_COMMAND=python3
 
 %if 0%{?suse_version} > 1320
-TOOL_CHAIN=GCC5
+TOOL_CHAIN=GCC
 %else
 echo `gcc -dumpversion`
 TOOL_CHAIN=GCC$(gcc -dumpversion|sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/')
@@ -205,13 +203,13 @@
 export CC=gcc-12
 export CXX=g++-12
 %endif
-       make -C BaseTools
+       make -C BaseTools EXTRA_LDFLAGS="-no-pie"
 %endif
 %ifarch aarch64
-       ARCH=AARCH64 make -C BaseTools
+       ARCH=AARCH64 make -C BaseTools EXTRA_LDFLAGS="-no-pie"
 %endif
 %ifarch riscv64
-       ARCH=RISCV64 make -C BaseTools
+       ARCH=RISCV64 make -C BaseTools EXTRA_LDFLAGS="-no-pie"
 %endif
 
 # Import the build functions


++++++ edk2-edk2-stable202602.tar.gz -> edk2-edk2-stable202605.tar.gz ++++++
/work/SRC/openSUSE:Factory/ovmf/edk2-edk2-stable202602.tar.gz 
/work/SRC/openSUSE:Factory/.ovmf.new.2375/edk2-edk2-stable202605.tar.gz differ: 
char 12, line 1




++++++ ovmf-BaseTools-Using-gcc12-for-building-image.patch ++++++
--- /var/tmp/diff_new_pack.wdGWpo/_old  2026-06-05 14:55:58.293565543 +0200
+++ /var/tmp/diff_new_pack.wdGWpo/_new  2026-06-05 14:55:58.297565708 +0200
@@ -20,36 +20,33 @@
  BaseTools/Conf/tools_def.template | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
-diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
-index c34ecfd557..6e7ae252b8 100755
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -1353,15 +1353,15 @@ RELEASE_GCC5_IA32_DLINK_FLAGS    = 
DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
- # GCC5 X64 definitions
+Index: edk2-edk2-stable202605/BaseTools/Conf/tools_def.template
+===================================================================
+--- edk2-edk2-stable202605.orig/BaseTools/Conf/tools_def.template
++++ edk2-edk2-stable202605/BaseTools/Conf/tools_def.template
+@@ -1183,15 +1183,15 @@ RELEASE_GCC_IA32_DLINK_FLAGS    = DEF(GC
+ # GCC X64 definitions
  ##################
- *_GCC5_X64_OBJCOPY_PATH          = DEF(GCC5_X64_PREFIX)objcopy
--*_GCC5_X64_CC_PATH               = DEF(GCC5_X64_PREFIX)gcc
--*_GCC5_X64_SLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc-ar
--*_GCC5_X64_DLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc
--*_GCC5_X64_ASLDLINK_PATH         = DEF(GCC5_X64_PREFIX)gcc
--*_GCC5_X64_ASM_PATH              = DEF(GCC5_X64_PREFIX)gcc
--*_GCC5_X64_PP_PATH               = DEF(GCC5_X64_PREFIX)gcc
--*_GCC5_X64_VFRPP_PATH            = DEF(GCC5_X64_PREFIX)gcc
--*_GCC5_X64_ASLCC_PATH            = DEF(GCC5_X64_PREFIX)gcc
--*_GCC5_X64_ASLPP_PATH            = DEF(GCC5_X64_PREFIX)gcc
-+*_GCC5_X64_CC_PATH               = DEF(GCC5_X64_PREFIX)gcc-12
-+*_GCC5_X64_SLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc-ar-12
-+*_GCC5_X64_DLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc-12
-+*_GCC5_X64_ASLDLINK_PATH         = DEF(GCC5_X64_PREFIX)gcc-12
-+*_GCC5_X64_ASM_PATH              = DEF(GCC5_X64_PREFIX)gcc-12
-+*_GCC5_X64_PP_PATH               = DEF(GCC5_X64_PREFIX)gcc-12
-+*_GCC5_X64_VFRPP_PATH            = DEF(GCC5_X64_PREFIX)gcc-12
-+*_GCC5_X64_ASLCC_PATH            = DEF(GCC5_X64_PREFIX)gcc-12
-+*_GCC5_X64_ASLPP_PATH            = DEF(GCC5_X64_PREFIX)gcc-12
- *_GCC5_X64_RC_PATH               = DEF(GCC5_X64_PREFIX)objcopy
+ *_GCC_X64_OBJCOPY_PATH          = DEF(GCC_X64_PREFIX)objcopy
+-*_GCC_X64_CC_PATH               = DEF(GCC_X64_PREFIX)gcc
+-*_GCC_X64_SLINK_PATH            = DEF(GCC_X64_PREFIX)gcc-ar
+-*_GCC_X64_DLINK_PATH            = DEF(GCC_X64_PREFIX)gcc
+-*_GCC_X64_ASLDLINK_PATH         = DEF(GCC_X64_PREFIX)gcc
+-*_GCC_X64_ASM_PATH              = DEF(GCC_X64_PREFIX)gcc
+-*_GCC_X64_PP_PATH               = DEF(GCC_X64_PREFIX)gcc
+-*_GCC_X64_VFRPP_PATH            = DEF(GCC_X64_PREFIX)gcc
+-*_GCC_X64_ASLCC_PATH            = DEF(GCC_X64_PREFIX)gcc
+-*_GCC_X64_ASLPP_PATH            = DEF(GCC_X64_PREFIX)gcc
++*_GCC_X64_CC_PATH               = DEF(GCC_X64_PREFIX)gcc-12
++*_GCC_X64_SLINK_PATH            = DEF(GCC_X64_PREFIX)gcc-ar-12
++*_GCC_X64_DLINK_PATH            = DEF(GCC_X64_PREFIX)gcc-12
++*_GCC_X64_ASLDLINK_PATH         = DEF(GCC_X64_PREFIX)gcc-12
++*_GCC_X64_ASM_PATH              = DEF(GCC_X64_PREFIX)gcc-12
++*_GCC_X64_PP_PATH               = DEF(GCC_X64_PREFIX)gcc-12
++*_GCC_X64_VFRPP_PATH            = DEF(GCC_X64_PREFIX)gcc-12
++*_GCC_X64_ASLCC_PATH            = DEF(GCC_X64_PREFIX)gcc-12
++*_GCC_X64_ASLPP_PATH            = DEF(GCC_X64_PREFIX)gcc-12
+ *_GCC_X64_RC_PATH               = DEF(GCC_X64_PREFIX)objcopy
  
- *_GCC5_X64_ASLCC_FLAGS           = DEF(GCC5_ASLCC_FLAGS) -m64
--- 
-2.35.3
-
+ *_GCC_X64_ASLCC_FLAGS           = DEF(GCC_ASLCC_FLAGS) -m64
 

++++++ ovmf-OvmfPkg-ArmVirtPkg-Keep-JSON-stack-cookie-files.patch ++++++
--- /var/tmp/diff_new_pack.wdGWpo/_old  2026-06-05 14:55:58.313566370 +0200
+++ /var/tmp/diff_new_pack.wdGWpo/_new  2026-06-05 14:55:58.317566536 +0200
@@ -14,125 +14,125 @@
 This patch includes the necessary StackCookieValues*.json files under the 
Build/
 directory to ensure reproducible builds for Ovmf and ArmVirt platforms.
 ---
- Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues32.json | 1 +
- Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues64.json | 1 +
- Build/IntelTdx/DEBUG_GCC5/StackCookieValues32.json            | 1 +
- Build/IntelTdx/DEBUG_GCC5/StackCookieValues64.json            | 1 +
- Build/Ovmf3264/DEBUG_GCC5/StackCookieValues32.json            | 1 +
- Build/Ovmf3264/DEBUG_GCC5/StackCookieValues64.json            | 1 +
- Build/OvmfX64/DEBUG_GCC5/StackCookieValues32.json             | 1 +
- Build/OvmfX64/DEBUG_GCC5/StackCookieValues64.json             | 1 +
- Build/OvmfXen/DEBUG_GCC5/StackCookieValues32.json             | 1 +
- Build/OvmfXen/DEBUG_GCC5/StackCookieValues64.json             | 1 +
- Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues32.json       | 1 +
- Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues64.json       | 1 +
+ Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues32.json | 1 +
+ Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues64.json | 1 +
+ Build/IntelTdx/DEBUG_GCC/StackCookieValues32.json            | 1 +
+ Build/IntelTdx/DEBUG_GCC/StackCookieValues64.json            | 1 +
+ Build/Ovmf3264/DEBUG_GCC/StackCookieValues32.json            | 1 +
+ Build/Ovmf3264/DEBUG_GCC/StackCookieValues64.json            | 1 +
+ Build/OvmfX64/DEBUG_GCC/StackCookieValues32.json             | 1 +
+ Build/OvmfX64/DEBUG_GCC/StackCookieValues64.json             | 1 +
+ Build/OvmfXen/DEBUG_GCC/StackCookieValues32.json             | 1 +
+ Build/OvmfXen/DEBUG_GCC/StackCookieValues64.json             | 1 +
+ Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues32.json       | 1 +
+ Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues64.json       | 1 +
  12 files changed, 12 insertions(+)
- create mode 100644 
Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues32.json
- create mode 100644 
Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues64.json
- create mode 100644 Build/IntelTdx/DEBUG_GCC5/StackCookieValues32.json
- create mode 100644 Build/IntelTdx/DEBUG_GCC5/StackCookieValues64.json
- create mode 100644 Build/Ovmf3264/DEBUG_GCC5/StackCookieValues32.json
- create mode 100644 Build/Ovmf3264/DEBUG_GCC5/StackCookieValues64.json
- create mode 100644 Build/OvmfX64/DEBUG_GCC5/StackCookieValues32.json
- create mode 100644 Build/OvmfX64/DEBUG_GCC5/StackCookieValues64.json
- create mode 100644 Build/OvmfXen/DEBUG_GCC5/StackCookieValues32.json
- create mode 100644 Build/OvmfXen/DEBUG_GCC5/StackCookieValues64.json
- create mode 100644 Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues32.json
- create mode 100644 Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues64.json
+ create mode 100644 
Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues32.json
+ create mode 100644 
Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues64.json
+ create mode 100644 Build/IntelTdx/DEBUG_GCC/StackCookieValues32.json
+ create mode 100644 Build/IntelTdx/DEBUG_GCC/StackCookieValues64.json
+ create mode 100644 Build/Ovmf3264/DEBUG_GCC/StackCookieValues32.json
+ create mode 100644 Build/Ovmf3264/DEBUG_GCC/StackCookieValues64.json
+ create mode 100644 Build/OvmfX64/DEBUG_GCC/StackCookieValues32.json
+ create mode 100644 Build/OvmfX64/DEBUG_GCC/StackCookieValues64.json
+ create mode 100644 Build/OvmfXen/DEBUG_GCC/StackCookieValues32.json
+ create mode 100644 Build/OvmfXen/DEBUG_GCC/StackCookieValues64.json
+ create mode 100644 Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues32.json
+ create mode 100644 Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues64.json
 
-diff --git a/Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues32.json 
b/Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues32.json
+diff --git a/Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues32.json 
b/Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues32.json
 new file mode 100644
 index 0000000000..279006e935
 --- /dev/null
-+++ b/Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues32.json
++++ b/Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues32.json
 @@ -0,0 +1 @@
 +[3120319409, 3986684851, 2532066904, 2838841122, 1510610980, 3527598979, 
2145389557, 915756566, 4288287152, 1592508515, 1649905414, 3214646158, 
4125604801, 2636301533, 3186946058, 1297075897, 1536483215, 2684947706, 
378837761, 2034357240, 1254156149, 3274923813, 1869941960, 2430363232, 
2619983763, 789706441, 474468987, 4170744684, 2067453149, 80774667, 1188610392, 
3484306439, 2129190303, 3706887221, 1441685697, 2832623778, 2272607630, 
3766098863, 1387705257, 3531882784, 78420450, 2425693472, 2515037057, 
2842949431, 2167471722, 2373850526, 2185844797, 1771878221, 3826200111, 
233544227, 3019808295, 3255256900, 3737050793, 1272285847, 4114161312, 
704148315, 2912601610, 3781534488, 56787233, 816583130, 2471213939, 2813874809, 
2630289327, 1173288302, 1862737445, 2551923525, 1820462035, 1796829267, 
1714358393, 2634249466, 176661566, 428907315, 2772923224, 1648291025, 
2674956839, 2691960542, 1859704968, 709746926, 492109362, 3781180214, 
4222775360, 2893670436, 2425292886, 1064615051, 3854
 554544, 1690467402, 356470947, 4203480635, 3958554922, 3830455836, 4051513359, 
2084475517, 728710918, 2413960477, 1005365008, 117621347, 1988965873, 
542004264, 1543091876, 856808939]
 \ No newline at end of file
-diff --git a/Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues64.json 
b/Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues64.json
+diff --git a/Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues64.json 
b/Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues64.json
 new file mode 100644
 index 0000000000..189f1bb32c
 --- /dev/null
-+++ b/Build/ArmVirtQemu-AArch64/DEBUG_GCC5/StackCookieValues64.json
++++ b/Build/ArmVirtQemu-AArch64/DEBUG_GCC/StackCookieValues64.json
 @@ -0,0 +1 @@
 +[7518985701012212569, 2601960957474891530, 17831311744988480182, 
16652208568711364861, 11779046321730877689, 4265457871546500992, 
7292254499229112648, 223890800426602719, 2838072854045228586, 
17406395504460044440, 15908843496796806072, 14702662319704085758, 
9867044736590216777, 1826029253899249568, 13211023111777598167, 
15781671485427291330, 10363743021216146144, 5806329751690313006, 
15745089491775103262, 17509746045803567900, 1447711951392380165, 
6118366145278105860, 4383356545218844403, 16245693987825670584, 
2780554830603218012, 12970299634944553151, 3222388605624008866, 
15814383424087557059, 15988086447905475558, 16116025969641329513, 
6426405161833441255, 3254481667731922028, 6488541859345202975, 
10574901139024748597, 3024566360722566355, 16062071326447635275, 
12345606174395125886, 6794103055184511112, 11215411239298654461, 
16898959837531392298, 11392129473298461016, 8804779203101922496, 
18248956894608479019, 3405499931018446142, 17086893422507178606, 
15658544032726530242, 83643
 33522488247864, 3279785515391664592, 13243140800673203277, 
5966586998550012975, 16565158092620888628, 12638930544692949903, 
1246241189792785842, 15194422135212677813, 12698266719810819587, 
1534974055018719502, 12670636876876282922, 15558200550263511669, 
3503220298365529701, 7528003967410398907, 17951113451990505790, 
11966189487560109058, 9487073780776752004, 16989174121673443471, 
11983187886593000791, 14034832459830322267, 7699754122092779654, 
11045278550085659092, 15517258337126557177, 11994491770159532604, 
12391224518810430854, 16412011954261833814, 6823393608276975560, 
8049664586953865101, 105554461905525278, 1108289617734621870, 
3107169899130739186, 16009603271400150224, 2287840628984514055, 
16506851535775780356, 3856407398241994124, 15057357339963415331, 
7421988999323764657, 16263909762531412778, 5520741619830646734, 
12658567612226487844, 4150397776403010384, 4506124991939010117, 
8337570680160461228, 1773277438796706851, 4411225815945427420, 
14662834929794280164, 27443909764823
 84579, 5016066739309353833, 2446711385473505783, 7207045095118849468, 
5059656042334578233, 5000969109599430964, 2861557136012695307, 
4840563942385966137]
 \ No newline at end of file
-diff --git a/Build/IntelTdx/DEBUG_GCC5/StackCookieValues32.json 
b/Build/IntelTdx/DEBUG_GCC5/StackCookieValues32.json
+diff --git a/Build/IntelTdx/DEBUG_GCC/StackCookieValues32.json 
b/Build/IntelTdx/DEBUG_GCC/StackCookieValues32.json
 new file mode 100644
 index 0000000000..279006e935
 --- /dev/null
-+++ b/Build/IntelTdx/DEBUG_GCC5/StackCookieValues32.json
++++ b/Build/IntelTdx/DEBUG_GCC/StackCookieValues32.json
 @@ -0,0 +1 @@
 +[3120319409, 3986684851, 2532066904, 2838841122, 1510610980, 3527598979, 
2145389557, 915756566, 4288287152, 1592508515, 1649905414, 3214646158, 
4125604801, 2636301533, 3186946058, 1297075897, 1536483215, 2684947706, 
378837761, 2034357240, 1254156149, 3274923813, 1869941960, 2430363232, 
2619983763, 789706441, 474468987, 4170744684, 2067453149, 80774667, 1188610392, 
3484306439, 2129190303, 3706887221, 1441685697, 2832623778, 2272607630, 
3766098863, 1387705257, 3531882784, 78420450, 2425693472, 2515037057, 
2842949431, 2167471722, 2373850526, 2185844797, 1771878221, 3826200111, 
233544227, 3019808295, 3255256900, 3737050793, 1272285847, 4114161312, 
704148315, 2912601610, 3781534488, 56787233, 816583130, 2471213939, 2813874809, 
2630289327, 1173288302, 1862737445, 2551923525, 1820462035, 1796829267, 
1714358393, 2634249466, 176661566, 428907315, 2772923224, 1648291025, 
2674956839, 2691960542, 1859704968, 709746926, 492109362, 3781180214, 
4222775360, 2893670436, 2425292886, 1064615051, 3854
 554544, 1690467402, 356470947, 4203480635, 3958554922, 3830455836, 4051513359, 
2084475517, 728710918, 2413960477, 1005365008, 117621347, 1988965873, 
542004264, 1543091876, 856808939]
 \ No newline at end of file
-diff --git a/Build/IntelTdx/DEBUG_GCC5/StackCookieValues64.json 
b/Build/IntelTdx/DEBUG_GCC5/StackCookieValues64.json
+diff --git a/Build/IntelTdx/DEBUG_GCC/StackCookieValues64.json 
b/Build/IntelTdx/DEBUG_GCC/StackCookieValues64.json
 new file mode 100644
 index 0000000000..189f1bb32c
 --- /dev/null
-+++ b/Build/IntelTdx/DEBUG_GCC5/StackCookieValues64.json
++++ b/Build/IntelTdx/DEBUG_GCC/StackCookieValues64.json
 @@ -0,0 +1 @@
 +[7518985701012212569, 2601960957474891530, 17831311744988480182, 
16652208568711364861, 11779046321730877689, 4265457871546500992, 
7292254499229112648, 223890800426602719, 2838072854045228586, 
17406395504460044440, 15908843496796806072, 14702662319704085758, 
9867044736590216777, 1826029253899249568, 13211023111777598167, 
15781671485427291330, 10363743021216146144, 5806329751690313006, 
15745089491775103262, 17509746045803567900, 1447711951392380165, 
6118366145278105860, 4383356545218844403, 16245693987825670584, 
2780554830603218012, 12970299634944553151, 3222388605624008866, 
15814383424087557059, 15988086447905475558, 16116025969641329513, 
6426405161833441255, 3254481667731922028, 6488541859345202975, 
10574901139024748597, 3024566360722566355, 16062071326447635275, 
12345606174395125886, 6794103055184511112, 11215411239298654461, 
16898959837531392298, 11392129473298461016, 8804779203101922496, 
18248956894608479019, 3405499931018446142, 17086893422507178606, 
15658544032726530242, 83643
 33522488247864, 3279785515391664592, 13243140800673203277, 
5966586998550012975, 16565158092620888628, 12638930544692949903, 
1246241189792785842, 15194422135212677813, 12698266719810819587, 
1534974055018719502, 12670636876876282922, 15558200550263511669, 
3503220298365529701, 7528003967410398907, 17951113451990505790, 
11966189487560109058, 9487073780776752004, 16989174121673443471, 
11983187886593000791, 14034832459830322267, 7699754122092779654, 
11045278550085659092, 15517258337126557177, 11994491770159532604, 
12391224518810430854, 16412011954261833814, 6823393608276975560, 
8049664586953865101, 105554461905525278, 1108289617734621870, 
3107169899130739186, 16009603271400150224, 2287840628984514055, 
16506851535775780356, 3856407398241994124, 15057357339963415331, 
7421988999323764657, 16263909762531412778, 5520741619830646734, 
12658567612226487844, 4150397776403010384, 4506124991939010117, 
8337570680160461228, 1773277438796706851, 4411225815945427420, 
14662834929794280164, 27443909764823
 84579, 5016066739309353833, 2446711385473505783, 7207045095118849468, 
5059656042334578233, 5000969109599430964, 2861557136012695307, 
4840563942385966137]
 \ No newline at end of file
-diff --git a/Build/Ovmf3264/DEBUG_GCC5/StackCookieValues32.json 
b/Build/Ovmf3264/DEBUG_GCC5/StackCookieValues32.json
+diff --git a/Build/Ovmf3264/DEBUG_GCC/StackCookieValues32.json 
b/Build/Ovmf3264/DEBUG_GCC/StackCookieValues32.json
 new file mode 100644
 index 0000000000..279006e935
 --- /dev/null
-+++ b/Build/Ovmf3264/DEBUG_GCC5/StackCookieValues32.json
++++ b/Build/Ovmf3264/DEBUG_GCC/StackCookieValues32.json
 @@ -0,0 +1 @@
 +[3120319409, 3986684851, 2532066904, 2838841122, 1510610980, 3527598979, 
2145389557, 915756566, 4288287152, 1592508515, 1649905414, 3214646158, 
4125604801, 2636301533, 3186946058, 1297075897, 1536483215, 2684947706, 
378837761, 2034357240, 1254156149, 3274923813, 1869941960, 2430363232, 
2619983763, 789706441, 474468987, 4170744684, 2067453149, 80774667, 1188610392, 
3484306439, 2129190303, 3706887221, 1441685697, 2832623778, 2272607630, 
3766098863, 1387705257, 3531882784, 78420450, 2425693472, 2515037057, 
2842949431, 2167471722, 2373850526, 2185844797, 1771878221, 3826200111, 
233544227, 3019808295, 3255256900, 3737050793, 1272285847, 4114161312, 
704148315, 2912601610, 3781534488, 56787233, 816583130, 2471213939, 2813874809, 
2630289327, 1173288302, 1862737445, 2551923525, 1820462035, 1796829267, 
1714358393, 2634249466, 176661566, 428907315, 2772923224, 1648291025, 
2674956839, 2691960542, 1859704968, 709746926, 492109362, 3781180214, 
4222775360, 2893670436, 2425292886, 1064615051, 3854
 554544, 1690467402, 356470947, 4203480635, 3958554922, 3830455836, 4051513359, 
2084475517, 728710918, 2413960477, 1005365008, 117621347, 1988965873, 
542004264, 1543091876, 856808939]
 \ No newline at end of file
-diff --git a/Build/Ovmf3264/DEBUG_GCC5/StackCookieValues64.json 
b/Build/Ovmf3264/DEBUG_GCC5/StackCookieValues64.json
+diff --git a/Build/Ovmf3264/DEBUG_GCC/StackCookieValues64.json 
b/Build/Ovmf3264/DEBUG_GCC/StackCookieValues64.json
 new file mode 100644
 index 0000000000..189f1bb32c
 --- /dev/null
-+++ b/Build/Ovmf3264/DEBUG_GCC5/StackCookieValues64.json
++++ b/Build/Ovmf3264/DEBUG_GCC/StackCookieValues64.json
 @@ -0,0 +1 @@
 +[7518985701012212569, 2601960957474891530, 17831311744988480182, 
16652208568711364861, 11779046321730877689, 4265457871546500992, 
7292254499229112648, 223890800426602719, 2838072854045228586, 
17406395504460044440, 15908843496796806072, 14702662319704085758, 
9867044736590216777, 1826029253899249568, 13211023111777598167, 
15781671485427291330, 10363743021216146144, 5806329751690313006, 
15745089491775103262, 17509746045803567900, 1447711951392380165, 
6118366145278105860, 4383356545218844403, 16245693987825670584, 
2780554830603218012, 12970299634944553151, 3222388605624008866, 
15814383424087557059, 15988086447905475558, 16116025969641329513, 
6426405161833441255, 3254481667731922028, 6488541859345202975, 
10574901139024748597, 3024566360722566355, 16062071326447635275, 
12345606174395125886, 6794103055184511112, 11215411239298654461, 
16898959837531392298, 11392129473298461016, 8804779203101922496, 
18248956894608479019, 3405499931018446142, 17086893422507178606, 
15658544032726530242, 83643
 33522488247864, 3279785515391664592, 13243140800673203277, 
5966586998550012975, 16565158092620888628, 12638930544692949903, 
1246241189792785842, 15194422135212677813, 12698266719810819587, 
1534974055018719502, 12670636876876282922, 15558200550263511669, 
3503220298365529701, 7528003967410398907, 17951113451990505790, 
11966189487560109058, 9487073780776752004, 16989174121673443471, 
11983187886593000791, 14034832459830322267, 7699754122092779654, 
11045278550085659092, 15517258337126557177, 11994491770159532604, 
12391224518810430854, 16412011954261833814, 6823393608276975560, 
8049664586953865101, 105554461905525278, 1108289617734621870, 
3107169899130739186, 16009603271400150224, 2287840628984514055, 
16506851535775780356, 3856407398241994124, 15057357339963415331, 
7421988999323764657, 16263909762531412778, 5520741619830646734, 
12658567612226487844, 4150397776403010384, 4506124991939010117, 
8337570680160461228, 1773277438796706851, 4411225815945427420, 
14662834929794280164, 27443909764823
 84579, 5016066739309353833, 2446711385473505783, 7207045095118849468, 
5059656042334578233, 5000969109599430964, 2861557136012695307, 
4840563942385966137]
 \ No newline at end of file
-diff --git a/Build/OvmfX64/DEBUG_GCC5/StackCookieValues32.json 
b/Build/OvmfX64/DEBUG_GCC5/StackCookieValues32.json
+diff --git a/Build/OvmfX64/DEBUG_GCC/StackCookieValues32.json 
b/Build/OvmfX64/DEBUG_GCC/StackCookieValues32.json
 new file mode 100644
 index 0000000000..279006e935
 --- /dev/null
-+++ b/Build/OvmfX64/DEBUG_GCC5/StackCookieValues32.json
++++ b/Build/OvmfX64/DEBUG_GCC/StackCookieValues32.json
 @@ -0,0 +1 @@
 +[3120319409, 3986684851, 2532066904, 2838841122, 1510610980, 3527598979, 
2145389557, 915756566, 4288287152, 1592508515, 1649905414, 3214646158, 
4125604801, 2636301533, 3186946058, 1297075897, 1536483215, 2684947706, 
378837761, 2034357240, 1254156149, 3274923813, 1869941960, 2430363232, 
2619983763, 789706441, 474468987, 4170744684, 2067453149, 80774667, 1188610392, 
3484306439, 2129190303, 3706887221, 1441685697, 2832623778, 2272607630, 
3766098863, 1387705257, 3531882784, 78420450, 2425693472, 2515037057, 
2842949431, 2167471722, 2373850526, 2185844797, 1771878221, 3826200111, 
233544227, 3019808295, 3255256900, 3737050793, 1272285847, 4114161312, 
704148315, 2912601610, 3781534488, 56787233, 816583130, 2471213939, 2813874809, 
2630289327, 1173288302, 1862737445, 2551923525, 1820462035, 1796829267, 
1714358393, 2634249466, 176661566, 428907315, 2772923224, 1648291025, 
2674956839, 2691960542, 1859704968, 709746926, 492109362, 3781180214, 
4222775360, 2893670436, 2425292886, 1064615051, 3854
 554544, 1690467402, 356470947, 4203480635, 3958554922, 3830455836, 4051513359, 
2084475517, 728710918, 2413960477, 1005365008, 117621347, 1988965873, 
542004264, 1543091876, 856808939]
 \ No newline at end of file
-diff --git a/Build/OvmfX64/DEBUG_GCC5/StackCookieValues64.json 
b/Build/OvmfX64/DEBUG_GCC5/StackCookieValues64.json
+diff --git a/Build/OvmfX64/DEBUG_GCC/StackCookieValues64.json 
b/Build/OvmfX64/DEBUG_GCC/StackCookieValues64.json
 new file mode 100644
 index 0000000000..189f1bb32c
 --- /dev/null
-+++ b/Build/OvmfX64/DEBUG_GCC5/StackCookieValues64.json
++++ b/Build/OvmfX64/DEBUG_GCC/StackCookieValues64.json
 @@ -0,0 +1 @@
 +[7518985701012212569, 2601960957474891530, 17831311744988480182, 
16652208568711364861, 11779046321730877689, 4265457871546500992, 
7292254499229112648, 223890800426602719, 2838072854045228586, 
17406395504460044440, 15908843496796806072, 14702662319704085758, 
9867044736590216777, 1826029253899249568, 13211023111777598167, 
15781671485427291330, 10363743021216146144, 5806329751690313006, 
15745089491775103262, 17509746045803567900, 1447711951392380165, 
6118366145278105860, 4383356545218844403, 16245693987825670584, 
2780554830603218012, 12970299634944553151, 3222388605624008866, 
15814383424087557059, 15988086447905475558, 16116025969641329513, 
6426405161833441255, 3254481667731922028, 6488541859345202975, 
10574901139024748597, 3024566360722566355, 16062071326447635275, 
12345606174395125886, 6794103055184511112, 11215411239298654461, 
16898959837531392298, 11392129473298461016, 8804779203101922496, 
18248956894608479019, 3405499931018446142, 17086893422507178606, 
15658544032726530242, 83643
 33522488247864, 3279785515391664592, 13243140800673203277, 
5966586998550012975, 16565158092620888628, 12638930544692949903, 
1246241189792785842, 15194422135212677813, 12698266719810819587, 
1534974055018719502, 12670636876876282922, 15558200550263511669, 
3503220298365529701, 7528003967410398907, 17951113451990505790, 
11966189487560109058, 9487073780776752004, 16989174121673443471, 
11983187886593000791, 14034832459830322267, 7699754122092779654, 
11045278550085659092, 15517258337126557177, 11994491770159532604, 
12391224518810430854, 16412011954261833814, 6823393608276975560, 
8049664586953865101, 105554461905525278, 1108289617734621870, 
3107169899130739186, 16009603271400150224, 2287840628984514055, 
16506851535775780356, 3856407398241994124, 15057357339963415331, 
7421988999323764657, 16263909762531412778, 5520741619830646734, 
12658567612226487844, 4150397776403010384, 4506124991939010117, 
8337570680160461228, 1773277438796706851, 4411225815945427420, 
14662834929794280164, 27443909764823
 84579, 5016066739309353833, 2446711385473505783, 7207045095118849468, 
5059656042334578233, 5000969109599430964, 2861557136012695307, 
4840563942385966137]
 \ No newline at end of file
-diff --git a/Build/OvmfXen/DEBUG_GCC5/StackCookieValues32.json 
b/Build/OvmfXen/DEBUG_GCC5/StackCookieValues32.json
+diff --git a/Build/OvmfXen/DEBUG_GCC/StackCookieValues32.json 
b/Build/OvmfXen/DEBUG_GCC/StackCookieValues32.json
 new file mode 100644
 index 0000000000..279006e935
 --- /dev/null
-+++ b/Build/OvmfXen/DEBUG_GCC5/StackCookieValues32.json
++++ b/Build/OvmfXen/DEBUG_GCC/StackCookieValues32.json
 @@ -0,0 +1 @@
 +[3120319409, 3986684851, 2532066904, 2838841122, 1510610980, 3527598979, 
2145389557, 915756566, 4288287152, 1592508515, 1649905414, 3214646158, 
4125604801, 2636301533, 3186946058, 1297075897, 1536483215, 2684947706, 
378837761, 2034357240, 1254156149, 3274923813, 1869941960, 2430363232, 
2619983763, 789706441, 474468987, 4170744684, 2067453149, 80774667, 1188610392, 
3484306439, 2129190303, 3706887221, 1441685697, 2832623778, 2272607630, 
3766098863, 1387705257, 3531882784, 78420450, 2425693472, 2515037057, 
2842949431, 2167471722, 2373850526, 2185844797, 1771878221, 3826200111, 
233544227, 3019808295, 3255256900, 3737050793, 1272285847, 4114161312, 
704148315, 2912601610, 3781534488, 56787233, 816583130, 2471213939, 2813874809, 
2630289327, 1173288302, 1862737445, 2551923525, 1820462035, 1796829267, 
1714358393, 2634249466, 176661566, 428907315, 2772923224, 1648291025, 
2674956839, 2691960542, 1859704968, 709746926, 492109362, 3781180214, 
4222775360, 2893670436, 2425292886, 1064615051, 3854
 554544, 1690467402, 356470947, 4203480635, 3958554922, 3830455836, 4051513359, 
2084475517, 728710918, 2413960477, 1005365008, 117621347, 1988965873, 
542004264, 1543091876, 856808939]
 \ No newline at end of file
-diff --git a/Build/OvmfXen/DEBUG_GCC5/StackCookieValues64.json 
b/Build/OvmfXen/DEBUG_GCC5/StackCookieValues64.json
+diff --git a/Build/OvmfXen/DEBUG_GCC/StackCookieValues64.json 
b/Build/OvmfXen/DEBUG_GCC/StackCookieValues64.json
 new file mode 100644
 index 0000000000..189f1bb32c
 --- /dev/null
-+++ b/Build/OvmfXen/DEBUG_GCC5/StackCookieValues64.json
++++ b/Build/OvmfXen/DEBUG_GCC/StackCookieValues64.json
 @@ -0,0 +1 @@
 +[7518985701012212569, 2601960957474891530, 17831311744988480182, 
16652208568711364861, 11779046321730877689, 4265457871546500992, 
7292254499229112648, 223890800426602719, 2838072854045228586, 
17406395504460044440, 15908843496796806072, 14702662319704085758, 
9867044736590216777, 1826029253899249568, 13211023111777598167, 
15781671485427291330, 10363743021216146144, 5806329751690313006, 
15745089491775103262, 17509746045803567900, 1447711951392380165, 
6118366145278105860, 4383356545218844403, 16245693987825670584, 
2780554830603218012, 12970299634944553151, 3222388605624008866, 
15814383424087557059, 15988086447905475558, 16116025969641329513, 
6426405161833441255, 3254481667731922028, 6488541859345202975, 
10574901139024748597, 3024566360722566355, 16062071326447635275, 
12345606174395125886, 6794103055184511112, 11215411239298654461, 
16898959837531392298, 11392129473298461016, 8804779203101922496, 
18248956894608479019, 3405499931018446142, 17086893422507178606, 
15658544032726530242, 83643
 33522488247864, 3279785515391664592, 13243140800673203277, 
5966586998550012975, 16565158092620888628, 12638930544692949903, 
1246241189792785842, 15194422135212677813, 12698266719810819587, 
1534974055018719502, 12670636876876282922, 15558200550263511669, 
3503220298365529701, 7528003967410398907, 17951113451990505790, 
11966189487560109058, 9487073780776752004, 16989174121673443471, 
11983187886593000791, 14034832459830322267, 7699754122092779654, 
11045278550085659092, 15517258337126557177, 11994491770159532604, 
12391224518810430854, 16412011954261833814, 6823393608276975560, 
8049664586953865101, 105554461905525278, 1108289617734621870, 
3107169899130739186, 16009603271400150224, 2287840628984514055, 
16506851535775780356, 3856407398241994124, 15057357339963415331, 
7421988999323764657, 16263909762531412778, 5520741619830646734, 
12658567612226487844, 4150397776403010384, 4506124991939010117, 
8337570680160461228, 1773277438796706851, 4411225815945427420, 
14662834929794280164, 27443909764823
 84579, 5016066739309353833, 2446711385473505783, 7207045095118849468, 
5059656042334578233, 5000969109599430964, 2861557136012695307, 
4840563942385966137]
 \ No newline at end of file
-diff --git a/Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues32.json 
b/Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues32.json
+diff --git a/Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues32.json 
b/Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues32.json
 new file mode 100644
 index 0000000000..279006e935
 --- /dev/null
-+++ b/Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues32.json
++++ b/Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues32.json
 @@ -0,0 +1 @@
 +[3120319409, 3986684851, 2532066904, 2838841122, 1510610980, 3527598979, 
2145389557, 915756566, 4288287152, 1592508515, 1649905414, 3214646158, 
4125604801, 2636301533, 3186946058, 1297075897, 1536483215, 2684947706, 
378837761, 2034357240, 1254156149, 3274923813, 1869941960, 2430363232, 
2619983763, 789706441, 474468987, 4170744684, 2067453149, 80774667, 1188610392, 
3484306439, 2129190303, 3706887221, 1441685697, 2832623778, 2272607630, 
3766098863, 1387705257, 3531882784, 78420450, 2425693472, 2515037057, 
2842949431, 2167471722, 2373850526, 2185844797, 1771878221, 3826200111, 
233544227, 3019808295, 3255256900, 3737050793, 1272285847, 4114161312, 
704148315, 2912601610, 3781534488, 56787233, 816583130, 2471213939, 2813874809, 
2630289327, 1173288302, 1862737445, 2551923525, 1820462035, 1796829267, 
1714358393, 2634249466, 176661566, 428907315, 2772923224, 1648291025, 
2674956839, 2691960542, 1859704968, 709746926, 492109362, 3781180214, 
4222775360, 2893670436, 2425292886, 1064615051, 3854
 554544, 1690467402, 356470947, 4203480635, 3958554922, 3830455836, 4051513359, 
2084475517, 728710918, 2413960477, 1005365008, 117621347, 1988965873, 
542004264, 1543091876, 856808939]
 \ No newline at end of file
-diff --git a/Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues64.json 
b/Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues64.json
+diff --git a/Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues64.json 
b/Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues64.json
 new file mode 100644
 index 0000000000..189f1bb32c
 --- /dev/null
-+++ b/Build/RiscVVirtQemu/DEBUG_GCC5/StackCookieValues64.json
++++ b/Build/RiscVVirtQemu/DEBUG_GCC/StackCookieValues64.json
 @@ -0,0 +1 @@
 +[7518985701012212569, 2601960957474891530, 17831311744988480182, 
16652208568711364861, 11779046321730877689, 4265457871546500992, 
7292254499229112648, 223890800426602719, 2838072854045228586, 
17406395504460044440, 15908843496796806072, 14702662319704085758, 
9867044736590216777, 1826029253899249568, 13211023111777598167, 
15781671485427291330, 10363743021216146144, 5806329751690313006, 
15745089491775103262, 17509746045803567900, 1447711951392380165, 
6118366145278105860, 4383356545218844403, 16245693987825670584, 
2780554830603218012, 12970299634944553151, 3222388605624008866, 
15814383424087557059, 15988086447905475558, 16116025969641329513, 
6426405161833441255, 3254481667731922028, 6488541859345202975, 
10574901139024748597, 3024566360722566355, 16062071326447635275, 
12345606174395125886, 6794103055184511112, 11215411239298654461, 
16898959837531392298, 11392129473298461016, 8804779203101922496, 
18248956894608479019, 3405499931018446142, 17086893422507178606, 
15658544032726530242, 83643
 33522488247864, 3279785515391664592, 13243140800673203277, 
5966586998550012975, 16565158092620888628, 12638930544692949903, 
1246241189792785842, 15194422135212677813, 12698266719810819587, 
1534974055018719502, 12670636876876282922, 15558200550263511669, 
3503220298365529701, 7528003967410398907, 17951113451990505790, 
11966189487560109058, 9487073780776752004, 16989174121673443471, 
11983187886593000791, 14034832459830322267, 7699754122092779654, 
11045278550085659092, 15517258337126557177, 11994491770159532604, 
12391224518810430854, 16412011954261833814, 6823393608276975560, 
8049664586953865101, 105554461905525278, 1108289617734621870, 
3107169899130739186, 16009603271400150224, 2287840628984514055, 
16506851535775780356, 3856407398241994124, 15057357339963415331, 
7421988999323764657, 16263909762531412778, 5520741619830646734, 
12658567612226487844, 4150397776403010384, 4506124991939010117, 
8337570680160461228, 1773277438796706851, 4411225815945427420, 
14662834929794280164, 27443909764823
 84579, 5016066739309353833, 2446711385473505783, 7207045095118849468, 
5059656042334578233, 5000969109599430964, 2861557136012695307, 
4840563942385966137]
 \ No newline at end of file

++++++ ovmf-Revert-Add-Stack-Cookie-Support-to-MSVC-and-GCC.patch ++++++
--- /var/tmp/diff_new_pack.wdGWpo/_old  2026-06-05 14:55:58.333567197 +0200
+++ /var/tmp/diff_new_pack.wdGWpo/_new  2026-06-05 14:55:58.337567362 +0200
@@ -9,11 +9,11 @@
  BaseTools/Conf/tools_def.template | 41 ++++++++++++++-----------------
  1 file changed, 19 insertions(+), 22 deletions(-)
 
-Index: edk2-edk2-stable202511/BaseTools/Conf/tools_def.template
+Index: edk2-edk2-stable202605/BaseTools/Conf/tools_def.template
 ===================================================================
---- edk2-edk2-stable202511.orig/BaseTools/Conf/tools_def.template
-+++ edk2-edk2-stable202511/BaseTools/Conf/tools_def.template
-@@ -608,9 +608,9 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   = /NO
+--- edk2-edk2-stable202605.orig/BaseTools/Conf/tools_def.template
++++ edk2-edk2-stable202605/BaseTools/Conf/tools_def.template
+@@ -595,9 +595,9 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   = /NO
  *_VS2019_IA32_PP_PATH      = DEF(VS2019_BIN_IA32)\cl.exe
  *_VS2019_IA32_ASM_PATH     = DEF(VS2019_BIN_IA32)\ml.exe
  
@@ -26,7 +26,7 @@
  
    DEBUG_VS2019_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
  RELEASE_VS2019_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd
-@@ -638,9 +638,9 @@ NOOPT_VS2019_IA32_DLINK_FLAGS   = /NOLOG
+@@ -625,9 +625,9 @@ NOOPT_VS2019_IA32_DLINK_FLAGS   = /NOLOG
  *_VS2019_X64_DLINK_PATH    = DEF(VS2019_BIN_X64)\link.exe
  *_VS2019_X64_ASLDLINK_PATH = DEF(VS2019_BIN_X64)\link.exe
  
@@ -39,7 +39,7 @@
  
    DEBUG_VS2019_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
  RELEASE_VS2019_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd
-@@ -725,9 +725,9 @@ NOOPT_VS2019_AARCH64_DLINK_FLAGS   = /NO
+@@ -713,9 +713,9 @@ NOOPT_VS2019_AARCH64_DLINK_FLAGS   = /NO
  *_VS2022_IA32_ASM_PATH     = DEF(VS2022_BIN_IA32)\ml.exe
  
        *_VS2022_IA32_MAKE_FLAGS  = /nologo
@@ -52,7 +52,7 @@
  
    DEBUG_VS2022_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
  RELEASE_VS2022_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd
-@@ -761,9 +761,9 @@ NOOPT_VS2022_IA32_DLINK_FLAGS   = /NOLOG
+@@ -749,9 +749,9 @@ NOOPT_VS2022_IA32_DLINK_FLAGS   = /NOLOG
  *_VS2022_X64_DLINK_PATH    = DEF(VS2022_BIN_X64)\link.exe
  *_VS2022_X64_ASLDLINK_PATH = DEF(VS2022_BIN_X64)\link.exe
  
@@ -65,29 +65,18 @@
  
    DEBUG_VS2022_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
  RELEASE_VS2022_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd
-@@ -833,10 +833,10 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --a
+@@ -925,10 +925,10 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --a
  *_*_*_DTC_PATH                     = DEF(DTC_BIN)
  
  # All supported GCC archs except LOONGARCH64 support 
-mstack-protector-guard=global, so set that on everything except LOONGARCH64
--DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h 
-fno-common -fstack-protector
--DEFINE GCC_IA32_X64_CC_FLAGS       = -mstack-protector-guard=global
-+DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h 
-fno-common
-+DEFINE GCC_IA32_X64_CC_FLAGS       = 
- DEFINE GCC_LOONGARCH64_CC_FLAGS    = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d 
-fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char 
-ffunction-sections -fdata-sections
--DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian 
-fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections 
-fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables 
-fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global
-+DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian 
-fno-short-enums -fverbose-asm -funsigned-char  -ffunction-sections 
-fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables 
-fno-pic -fno-pie -ffixed-x18
- DEFINE GCC_AARCH64_CC_XIPFLAGS     = -mstrict-align -mgeneral-regs-only
- DEFINE GCC_RISCV64_CC_XIPFLAGS     = -mstrict-align -mgeneral-regs-only
- DEFINE GCC_DLINK2_FLAGS_COMMON     = 
-Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
-@@ -864,8 +864,8 @@ DEFINE GCC_DEPS_FLAGS              = -MM
- 
- DEFINE GCC48_ALL_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) 
-ffunction-sections -fdata-sections -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
- DEFINE GCC48_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z 
common-page-size=0x20
--DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC48_ALL_CC_FLAGS) 
DEF(GCC_IA32_X64_CC_FLAGS) -m32 -march=i586 -malign-double -D EFI32 
-fno-asynchronous-unwind-tables -Wno-address -fno-omit-frame-pointer -fno-pic 
-fno-pie
--DEFINE GCC48_X64_CC_FLAGS            = DEF(GCC48_ALL_CC_FLAGS) 
DEF(GCC_IA32_X64_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" 
-maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie 
-fno-asynchronous-unwind-tables -Wno-address  -fno-omit-frame-pointer
-+DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC48_ALL_CC_FLAGS) -m32 
-march=i586 -malign-double -fno-stack-protector -D EFI32 
-fno-asynchronous-unwind-tables -Wno-address -fno-omit-frame-pointer
-+DEFINE GCC48_X64_CC_FLAGS            = DEF(GCC48_ALL_CC_FLAGS) -m64 
-fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" 
-maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie 
-fno-asynchronous-unwind-tables -Wno-address  -fno-omit-frame-pointer
- DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) 
-Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
- DEFINE GCC48_IA32_X64_DLINK_FLAGS    = DEF(GCC48_IA32_X64_DLINK_COMMON) 
-Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) 
-Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
- DEFINE GCC48_IA32_DLINK2_FLAGS       = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 
DEF(GCC_DLINK2_FLAGS_COMMON)
+-DEFINE GCC_ALL_CC_COMMON               = -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h 
-fno-common -fstack-protector
+-DEFINE GCC_IA32_X64_CC_FLAGS           = -mstack-protector-guard=global
++DEFINE GCC_ALL_CC_COMMON               = -g -Os -fshort-wchar -fno-builtin 
-fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h 
-fno-common
++DEFINE GCC_IA32_X64_CC_FLAGS           = 
+ DEFINE GCC_LOONGARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_COMMON) -mabi=lp64d 
-fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char 
-ffunction-sections -fdata-sections -march=loongarch64 -mno-memcpy -Werror 
-Wno-maybe-uninitialized -Wno-stringop-overflow -Wno-pointer-to-int-cast 
-no-pie -fno-stack-protector -mno-explicit-relocs -mno-relax
+-DEFINE GCC_AARCH64_CC_COMMON           = DEF(GCC_ALL_CC_COMMON) 
-mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char  
-ffunction-sections -fdata-sections -Wno-address 
-fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie 
-ffixed-x18 -mstack-protector-guard=global
++DEFINE GCC_AARCH64_CC_COMMON           = DEF(GCC_ALL_CC_COMMON) 
-mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char  
-ffunction-sections -fdata-sections -Wno-address 
-fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18
+ DEFINE GCC_AARCH64_CC_XIPCOMMON        = -mstrict-align -mgeneral-regs-only
+ DEFINE GCC_RISCV64_CC_XIPFLAGS         = -mstrict-align -mgeneral-regs-only
+ DEFINE GCC_DLINK2_FLAGS_COMMON         = 
-Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds
 

++++++ ovmf-Revert-UefiCpuPkg-BaseRiscV64CpuTimerLib-Add-constru.patch ++++++
--- /var/tmp/diff_new_pack.wdGWpo/_old  2026-06-05 14:55:58.361568355 +0200
+++ /var/tmp/diff_new_pack.wdGWpo/_new  2026-06-05 14:55:58.365568521 +0200
@@ -1,17 +1,17 @@
-From 756560b2ec49a63ef86808615cf1746266c1144f Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <[email protected]>
-Date: Fri, 27 Feb 2026 12:36:31 +0100
+From 46bdec1ca62b3e984dcae70329885ef7ff6f0047 Mon Sep 17 00:00:00 2001
+From: Richard Lyu <[email protected]>
+Date: Thu, 4 Jun 2026 10:31:11 +0800
 Subject: [PATCH] Revert "UefiCpuPkg/BaseRiscV64CpuTimerLib: Add constructor to
  initialize mTimeBase"
 
-This reverts commit f2c63dca1bc5201903b75a8551afdf2c7ab2fc4d.
+This reverts commit c27b555439a8e8a478a99fceb8c7e1463e53cac7.
 ---
- .../BaseRiscV64CpuTimerLib.inf                |   1 -
- .../BaseRiscV64CpuTimerLib/CpuTimerLib.c      | 113 ++++++++----------
- 2 files changed, 50 insertions(+), 64 deletions(-)
+ .../BaseRiscV64CpuTimerLib.inf                |  1 -
+ .../BaseRiscV64CpuTimerLib/CpuTimerLib.c      | 21 -------------------
+ 2 files changed, 22 deletions(-)
 
 diff --git 
a/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLib.inf 
b/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLib.inf
-index a3d25cda41..b7ae1e86b7 100644
+index a3d25cda4173..b7ae1e86b74d 100644
 --- a/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLib.inf
 +++ b/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLib.inf
 @@ -16,7 +16,6 @@
@@ -23,96 +23,18 @@
  [Sources]
    CpuTimerLib.c
 diff --git a/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/CpuTimerLib.c 
b/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/CpuTimerLib.c
-index f93e841a45..bb07200754 100644
+index df4f8c224572..74d660642cd3 100644
 --- a/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/CpuTimerLib.c
 +++ b/UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/CpuTimerLib.c
-@@ -21,6 +21,8 @@
+@@ -262,24 +262,3 @@ GetTimeInNanoSecond (
  
- STATIC UINT64  mTimeBase;
- 
-+#define GET_TIME_BASE()  (mTimeBase ?: GetPerformanceCounterProperties(NULL, 
NULL))
-+
- /**
-   Stalls the CPU for at least the given number of ticks.
- 
-@@ -65,7 +67,7 @@ MicroSecondDelay (
-     DivU64x32 (
-       MultU64x32 (
-         MicroSeconds,
--        mTimeBase
-+        GET_TIME_BASE ()
-         ),
-       1000000u
-       )
-@@ -93,7 +95,7 @@ NanoSecondDelay (
-     DivU64x32 (
-       MultU64x32 (
-         NanoSeconds,
--        mTimeBase
-+        GET_TIME_BASE ()
-         ),
-       1000000000u
-       )
-@@ -152,6 +154,12 @@ GetPerformanceCounterProperties (
-   OUT      UINT64                    *EndValue     OPTIONAL
-   )
- {
-+  VOID                    *Hob;
-+  RISCV_SEC_HANDOFF_DATA  *SecData;
-+  CONST EFI_GUID          SecHobDataGuid = RISCV_SEC_HANDOFF_HOB_GUID;
-+  UINT64                  TimeBase;
-+  CONST VOID              *FdtBase;
-+
-   if (StartValue != NULL) {
-     *StartValue = 0;
-   }
-@@ -160,66 +168,9 @@ GetPerformanceCounterProperties (
-     *EndValue = 32 - 1;
-   }
- 
--  return mTimeBase;
--}
--
--/**
--  Converts elapsed ticks of performance counter to time in nanoseconds.
--
--  This function converts the elapsed ticks of running performance counter to
--  time value in unit of nanoseconds.
--
--  @param  Ticks     The number of elapsed ticks of running performance 
counter.
--
--  @return The elapsed time in nanoseconds.
--
--**/
--UINT64
--EFIAPI
--GetTimeInNanoSecond (
--  IN      UINT64  Ticks
--  )
--{
--  UINT64  NanoSeconds;
--  UINT32  Remainder;
--
--  //
--  //          Ticks
--  // Time = --------- x 1,000,000,000
--  //        Frequency
--  //
--  NanoSeconds = MultU64x32 (DivU64x32Remainder (Ticks, mTimeBase, 
&Remainder), 1000000000u);
--
--  //
--  // Frequency < 0x100000000, so Remainder < 0x100000000, then (Remainder * 
1,000,000,000)
--  // will not overflow 64-bit.
--  //
--  NanoSeconds += DivU64x32 (MultU64x32 ((UINT64)Remainder, 1000000000u), 
mTimeBase);
--
--  return NanoSeconds;
--}
+   return NanoSeconds;
+ }
 -
 -/**
 -  Constructor function for the Timer Library.
 -
--  This constructor function is called early during DXE phase to ensure that
+-  This constructor function is called early during booting to ensure that
 -  GetPerformanceCounterProperties() is invoked and mTimeBase is initialized
 -  before any code that depends on it.
 -
@@ -125,61 +47,11 @@
 -  VOID
 -  )
 -{
--  VOID                    *Hob;
--  RISCV_SEC_HANDOFF_DATA  *SecData;
--  CONST EFI_GUID          SecHobDataGuid = RISCV_SEC_HANDOFF_HOB_GUID;
--  UINT64                  TimeBase;
--  CONST VOID              *FdtBase;
-+  if (mTimeBase != 0) {
-+    return mTimeBase;
-+  }
- 
-   //
-   // Locate the FDT HOB and validate header
-@@ -273,5 +224,41 @@ BaseRiscV64CpuTimerLibConstructor (
-   //
-   mTimeBase = TimeBase;
- 
+-  GetPerformanceCounterProperties (NULL, NULL);
+-
 -  return EFI_SUCCESS;
-+  return TimeBase;
-+}
-+
-+/**
-+  Converts elapsed ticks of performance counter to time in nanoseconds.
-+
-+  This function converts the elapsed ticks of running performance counter to
-+  time value in unit of nanoseconds.
-+
-+  @param  Ticks     The number of elapsed ticks of running performance 
counter.
-+
-+  @return The elapsed time in nanoseconds.
-+
-+**/
-+UINT64
-+EFIAPI
-+GetTimeInNanoSecond (
-+  IN      UINT64  Ticks
-+  )
-+{
-+  UINT64  NanoSeconds;
-+  UINT32  Remainder;
-+
-+  //
-+  //          Ticks
-+  // Time = --------- x 1,000,000,000
-+  //        Frequency
-+  //
-+  NanoSeconds = MultU64x32 (DivU64x32Remainder (Ticks, GET_TIME_BASE (), 
&Remainder), 1000000000u);
-+
-+  //
-+  // Frequency < 0x100000000, so Remainder < 0x100000000, then (Remainder * 
1,000,000,000)
-+  // will not overflow 64-bit.
-+  //
-+  NanoSeconds += DivU64x32 (MultU64x32 ((UINT64)Remainder, 1000000000u), 
GET_TIME_BASE ());
-+
-+  return NanoSeconds;
- }
+-}
 -- 
-2.52.0
+2.51.0
 
 

Reply via email to