Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S

@@ -7 +7 @@
 #------------------------------------------------------------------------------
 
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
 
   .set CTRL_M_BIT,      (1 << 0)
@@ -87 +87 @@
   isb
 
-  EL1_OR_EL2_OR_EL3(x5)
+  EL1_OR_EL2(x5)
 1:__replace_entry 1
   b     4f
 2:__replace_entry 2
-  b     4f
-3:__replace_entry 3
 
 4:msr   daif, x4