edk2 PR https://github.com/tianocore/edk2/pull/6048 moves AsmMacroIoLib.h and AsmMacroIoLibV8.h to MdePkg and renames them to Arm/AsmMacroLib.h and AArch64/AsmMacroLib.h, respectively.
This updates all edk2-platforms in one go, as this is a breaking change and no functional change. Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Leif Lindholm <quic_llind...@quicinc.com> Cc: Michael D Kinney <michael.d.kin...@intel.com> Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Oliver Smith-Denny <o...@linux.microsoft.com> --- Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S | 2 +- Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S | 2 +- Platform/ARM/Library/ArmShellCmdRunAxf/AArch64/Pivot.S | 2 +- Platform/ARM/Library/ArmShellCmdRunAxf/Arm/Pivot.S | 2 +- Platform/ARM/Morello/Library/PlatformLib/AArch64/Helper.S | 2 +- Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S | 2 +- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S | 2 +- Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S | 2 +- Platform/BeagleBoard/BeagleBoardPkg/PrePi/Arm/ModuleEntryPoint.S | 2 +- Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S | 2 +- Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S | 2 +- Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S | 2 +- Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S | 2 +- Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S | 2 +- Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S | 2 +- Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S | 2 +- Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/AArch64/Helper.S | 2 +- Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformHelper.S | 2 +- Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S | 2 +- Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S | 2 +- Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S | 2 +- Silicon/Marvell/OdysseyPkg/Library/OdysseyLib/AArch64/ArmPlatformHelper.S | 2 +- Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/AArch64/PhytiumPlatformHelper.S | 2 +- Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S | 2 +- Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S | 2 +- Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S b/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S index 6a73fde3afe5..9870c6eb83ce 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S @@ -6,7 +6,7 @@ * **/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S b/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S index 0f5a7169ae6f..9e9c561c410a 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S @@ -6,7 +6,7 @@ * **/ -#include <AsmMacroIoLib.h> +#include <Arm/AsmMacroLib.h> #include <Library/ArmLib.h> // diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/AArch64/Pivot.S b/Platform/ARM/Library/ArmShellCmdRunAxf/AArch64/Pivot.S index 1ab4b15f127b..c072db2af7eb 100644 --- a/Platform/ARM/Library/ArmShellCmdRunAxf/AArch64/Pivot.S +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/AArch64/Pivot.S @@ -4,7 +4,7 @@ // SPDX-License-Identifier: BSD-2-Clause-Patent // -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> // VOID // RunAxfPivot ( diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/Arm/Pivot.S b/Platform/ARM/Library/ArmShellCmdRunAxf/Arm/Pivot.S index 50efcfacdfe6..5db2a9acdf37 100644 --- a/Platform/ARM/Library/ArmShellCmdRunAxf/Arm/Pivot.S +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/Arm/Pivot.S @@ -4,7 +4,7 @@ // SPDX-License-Identifier: BSD-2-Clause-Patent // -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> // VOID // RunAxfPivot ( diff --git a/Platform/ARM/Morello/Library/PlatformLib/AArch64/Helper.S b/Platform/ARM/Morello/Library/PlatformLib/AArch64/Helper.S index 25490cfd1acd..ce8d65a78ccb 100644 --- a/Platform/ARM/Morello/Library/PlatformLib/AArch64/Helper.S +++ b/Platform/ARM/Morello/Library/PlatformLib/AArch64/Helper.S @@ -5,7 +5,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> .text diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S b/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S index 704ac9bbb1cd..ef8e2046affe 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S @@ -6,7 +6,7 @@ * **/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> .text diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S index 9920452206a0..ef4e11e65f20 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S @@ -5,7 +5,7 @@ # # -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S index 007126e86342..6b81109963f0 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S +++ b/Platform/BeagleBoard/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardHelper.S @@ -5,7 +5,7 @@ # # -#include <AsmMacroIoLib.h> +#include <Arm/AsmMacroLib.h> #include <AutoGen.h> .text diff --git a/Platform/BeagleBoard/BeagleBoardPkg/PrePi/Arm/ModuleEntryPoint.S b/Platform/BeagleBoard/BeagleBoardPkg/PrePi/Arm/ModuleEntryPoint.S index 505ee0a5ce07..7eb0d4ceb112 100644 --- a/Platform/BeagleBoard/BeagleBoardPkg/PrePi/Arm/ModuleEntryPoint.S +++ b/Platform/BeagleBoard/BeagleBoardPkg/PrePi/Arm/ModuleEntryPoint.S @@ -5,7 +5,7 @@ // // -#include <AsmMacroIoLib.h> +#include <Arm/AsmMacroLib.h> #include <Arm/AArch32.h> #include <Arm/AArch32Mmu.h> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S index 4c03e7b7be24..4e5e92d3c227 100644 --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S @@ -5,7 +5,7 @@ # # -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S index a7bae8805e4b..484ba63c7450 100644 --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S @@ -5,7 +5,7 @@ # # -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> .text diff --git a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S index 1eeb7fed6f19..221c6aa9725b 100644 --- a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S @@ -5,7 +5,7 @@ // // -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S b/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S index 1eeb7fed6f19..221c6aa9725b 100644 --- a/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S +++ b/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S @@ -5,7 +5,7 @@ // // -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S b/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S index 1eeb7fed6f19..221c6aa9725b 100644 --- a/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S +++ b/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatformHelper.S @@ -5,7 +5,7 @@ // // -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S b/Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S index 3fb696b13fd3..86564e7228ab 100644 --- a/Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S +++ b/Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S @@ -9,7 +9,7 @@ * **/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> #include <IndustryStandard/Bcm2836.h> #include <IndustryStandard/RpiMbox.h> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S index 5c3617321347..278c6d58710c 100644 --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S @@ -11,7 +11,7 @@ # ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMHelper.S # #**/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> //VOID diff --git a/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/AArch64/Helper.S b/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/AArch64/Helper.S index 6a5550da9133..71c9de06d800 100644 --- a/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/AArch64/Helper.S +++ b/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/AArch64/Helper.S @@ -6,7 +6,7 @@ * **/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> .text diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformHelper.S b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformHelper.S index 7f896a4c7ebc..59c93e0360c0 100644 --- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformHelper.S +++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformHelper.S @@ -10,7 +10,7 @@ * Derived from edk2/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S **/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S index 8c324b5509f0..f5b4281bee63 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S @@ -9,7 +9,7 @@ // // -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S index 81279b39906b..e26f8d034136 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S @@ -9,7 +9,7 @@ // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED // -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S index 2eebc682c85a..b8fcacba0810 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S @@ -10,7 +10,7 @@ // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED // -#include <AsmMacroIoLib.h> +#include <Arm/AsmMacroLib.h> #include <Library/ArmLib.h> #define CCU_MC_BASE 0xF0001700 diff --git a/Silicon/Marvell/OdysseyPkg/Library/OdysseyLib/AArch64/ArmPlatformHelper.S b/Silicon/Marvell/OdysseyPkg/Library/OdysseyLib/AArch64/ArmPlatformHelper.S index e816e6bd5a8a..4730788725ab 100644 --- a/Silicon/Marvell/OdysseyPkg/Library/OdysseyLib/AArch64/ArmPlatformHelper.S +++ b/Silicon/Marvell/OdysseyPkg/Library/OdysseyLib/AArch64/ArmPlatformHelper.S @@ -9,7 +9,7 @@ * Based on ArmPlatformPkg/Library/ArmPlatformLibNull **/ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Base.h> #include <Library/ArmLib.h> #include <Library/PcdLib.h> diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/AArch64/PhytiumPlatformHelper.S b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/AArch64/PhytiumPlatformHelper.S index 9be8cf7cab25..fd7400e61c82 100644 --- a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/AArch64/PhytiumPlatformHelper.S +++ b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/AArch64/PhytiumPlatformHelper.S @@ -11,7 +11,7 @@ # # -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Base.h> #include <Library/ArmLib.h> #include <Library/PcdLib.h> diff --git a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S index ed51f6613a17..876d9180719f 100644 --- a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S +++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent # -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> ASM_FUNC(ArmPlatformPeiBootAction) diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S index 6a19c8b32c3f..108db45e1edc 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S @@ -7,7 +7,7 @@ * */ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> .text diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S index ec4cf1da5cba..2587d2ad9cf7 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S @@ -7,7 +7,7 @@ * */ -#include <AsmMacroIoLibV8.h> +#include <AArch64/AsmMacroLib.h> #include <Library/ArmLib.h> .text -- 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#120432): https://edk2.groups.io/g/devel/message/120432 Mute This Topic: https://groups.io/mt/108166768/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
