public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs
@ 2024-08-29 18:32 Oliver Smith-Denny
  2024-08-29 18:32 ` [edk2-devel] [PATCH v1 1/3] Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes Oliver Smith-Denny
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Oliver Smith-Denny @ 2024-08-29 18:32 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney

edk2 PR https://github.com/tianocore/edk2/pull/6048 moved some architectural pieces
from ArmPkg to MdePkg. This patch updates all platforms (& etc.) in edk2-platforms
to use the MdePkg versions of these libs.

This patch is dependent on the above edk2 merging and must not be merged before that
goes in.

It's been a little while since I've sent a patch on the mailing list, so hopefully I
have everything right :).

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Oliver Smith-Denny (3):
  Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes
  ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib
  ARM Platforms: Drop ArmSoftFloatLib

 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc                                       |  7 -------
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc                                    |  7 -------
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc                            |  1 -
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc                            |  7 -------
 Silicon/Hisilicon/Hisilicon.dsc.inc                                             |  7 -------
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                                   | 10 ----------
 Silicon/Marvell/OdysseyPkg/OdysseyPkg.dsc.inc                                   |  7 -------
 Silicon/NXP/NxpQoriqLs.dsc.inc                                                  |  8 --------
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc                       |  2 --
 Drivers/ASIX/Asix.dsc                                                           |  3 ---
 Drivers/DisplayLink/DisplayLinkPkg/DisplayLinkPkg.dsc                           |  2 --
 Drivers/OptionRomPkg/OptionRomPkg.dsc                                           |  3 ---
 Features/ManageabilityPkg/Include/Manageability.dsc                             |  5 -----
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc                                  |  9 ---------
 Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc                               |  1 -
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc                          |  7 -------
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                                      |  9 ---------
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc                                             |  6 ------
 Platform/RaspberryPi/RPi3/RPi3.dsc                                              |  6 ------
 Platform/RaspberryPi/RPi4/RPi4.dsc                                              |  6 ------
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc                                |  3 ---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc                    |  4 ----
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc                     |  9 ---------
 Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc      | 10 ----------
 Silicon/Openmoko/Openmoko.dsc                                                   |  3 ---
 Silicon/Synopsys/DesignWare/DesignWare.dsc                                      |  1 -
 Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc                            |  1 -
 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 +-
 53 files changed, 26 insertions(+), 170 deletions(-)

-- 
2.40.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120431): https://edk2.groups.io/g/devel/message/120431
Mute This Topic: https://groups.io/mt/108166767/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [edk2-devel] [PATCH v1 1/3] Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes
  2024-08-29 18:32 [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Oliver Smith-Denny
@ 2024-08-29 18:32 ` Oliver Smith-Denny
  2024-08-29 18:32 ` [edk2-devel] [PATCH v1 2/3] ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib Oliver Smith-Denny
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Oliver Smith-Denny @ 2024-08-29 18:32 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney

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+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Continuous-integration-options: PatchCheck.ignore-multi-package

Signed-off-by: Oliver Smith-Denny <osde@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/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [edk2-devel] [PATCH v1 2/3] ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib
  2024-08-29 18:32 [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Oliver Smith-Denny
  2024-08-29 18:32 ` [edk2-devel] [PATCH v1 1/3] Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes Oliver Smith-Denny
@ 2024-08-29 18:32 ` Oliver Smith-Denny
  2024-08-29 18:32 ` [edk2-devel] [PATCH v1 3/3] ARM Platforms: Drop ArmSoftFloatLib Oliver Smith-Denny
  2024-08-29 18:59 ` [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Ard Biesheuvel via groups.io
  3 siblings, 0 replies; 7+ messages in thread
From: Oliver Smith-Denny @ 2024-08-29 18:32 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney

edk2 PR https://github.com/tianocore/edk2/pull/6048 moves
ArmCompilerIntrinsicsLib to MdePkg and into MdeLibs.dsc.inc.

This patch drops all of the references to the ArmPkg location as
these platforms are now getting it from MdeLibs.dsc.inc. This is
done in one shot as it is a breaking change and has no functional
impact.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Continuous-integration-options: PatchCheck.ignore-multi-package

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
---
 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc                                  | 7 -------
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc                               | 7 -------
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc                       | 1 -
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc                       | 7 -------
 Silicon/Hisilicon/Hisilicon.dsc.inc                                        | 7 -------
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                              | 7 -------
 Silicon/Marvell/OdysseyPkg/OdysseyPkg.dsc.inc                              | 7 -------
 Silicon/NXP/NxpQoriqLs.dsc.inc                                             | 8 --------
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc                  | 2 --
 Drivers/ASIX/Asix.dsc                                                      | 3 ---
 Drivers/DisplayLink/DisplayLinkPkg/DisplayLinkPkg.dsc                      | 2 --
 Drivers/OptionRomPkg/OptionRomPkg.dsc                                      | 3 ---
 Features/ManageabilityPkg/Include/Manageability.dsc                        | 4 ----
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc                             | 9 ---------
 Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc                          | 1 -
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc                     | 7 -------
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                                 | 9 ---------
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc                                        | 6 ------
 Platform/RaspberryPi/RPi3/RPi3.dsc                                         | 6 ------
 Platform/RaspberryPi/RPi4/RPi4.dsc                                         | 6 ------
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc               | 1 -
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc                | 9 ---------
 Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc | 7 -------
 Silicon/Openmoko/Openmoko.dsc                                              | 3 ---
 Silicon/Synopsys/DesignWare/DesignWare.dsc                                 | 1 -
 Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc                       | 1 -
 26 files changed, 131 deletions(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
index f4fe1b3f69cc..0b01871fb7a9 100644
--- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
@@ -49,13 +49,6 @@ [LibraryClasses]
 
   StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
 
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # And NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [LibraryClasses.common.MM_STANDALONE]
   HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf
   MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 931eff2355d4..03017ed50065 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -278,13 +278,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.AARCH64]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc
index 4332c19ad698..ac84e84915fe 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc
@@ -98,7 +98,6 @@ [LibraryClasses]
   SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
   PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
 
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
index d2941e23b464..d926aadec756 100644
--- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
+++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
@@ -275,13 +275,6 @@ [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION, Libr
   ManageabilityTransportLib|ManageabilityPkg/Library/ManageabilityTransportSsifLib/Dxe/DxeManageabilityTransportSsif.inf
 
 [LibraryClasses.ARM,LibraryClasses.AARCH64]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   #
   # Add support for GCC stack protector
   #
diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index 5db85841c5dc..ccf46327fbe0 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -114,13 +114,6 @@ [LibraryClasses.common]
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
   PlatformFlashAccessLib|Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.inf
 
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # And NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 5ad8d242b633..4e1f73b94753 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -201,13 +201,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Silicon/Marvell/OdysseyPkg/OdysseyPkg.dsc.inc b/Silicon/Marvell/OdysseyPkg/OdysseyPkg.dsc.inc
index e837a51f53c6..0c2578501c6a 100644
--- a/Silicon/Marvell/OdysseyPkg/OdysseyPkg.dsc.inc
+++ b/Silicon/Marvell/OdysseyPkg/OdysseyPkg.dsc.inc
@@ -234,13 +234,6 @@ [LibraryClasses.AARCH64.DXE_RUNTIME_DRIVER]
   ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Silicon/NXP/NxpQoriqLs.dsc.inc b/Silicon/NXP/NxpQoriqLs.dsc.inc
index a359f4c5c22d..556dab79956e 100644
--- a/Silicon/NXP/NxpQoriqLs.dsc.inc
+++ b/Silicon/NXP/NxpQoriqLs.dsc.inc
@@ -175,14 +175,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
-[LibraryClasses.AARCH64]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [BuildOptions]
   GCC:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
 
diff --git a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
index 7e91d7eed588..741ce493ba81 100644
--- a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
+++ b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
@@ -187,8 +187,6 @@ [LibraryClasses.AARCH64.DXE_RUNTIME_DRIVER]
   ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   #
   # Add support for GCC stack protector
   #
diff --git a/Drivers/ASIX/Asix.dsc b/Drivers/ASIX/Asix.dsc
index 36ec2d587f88..279ab37ef194 100644
--- a/Drivers/ASIX/Asix.dsc
+++ b/Drivers/ASIX/Asix.dsc
@@ -46,9 +46,6 @@ [LibraryClasses]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
 
-[LibraryClasses.AARCH64, LibraryClasses.ARM]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [LibraryClasses.ARM]
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Drivers/DisplayLink/DisplayLinkPkg/DisplayLinkPkg.dsc b/Drivers/DisplayLink/DisplayLinkPkg/DisplayLinkPkg.dsc
index d2dffecd9ef0..b6c53be9592c 100644
--- a/Drivers/DisplayLink/DisplayLinkPkg/DisplayLinkPkg.dsc
+++ b/Drivers/DisplayLink/DisplayLinkPkg/DisplayLinkPkg.dsc
@@ -37,11 +37,9 @@ [LibraryClasses.common.UEFI_DRIVER]
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
 
 [LibraryClasses.AARCH64]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 [LibraryClasses.ARM]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 [PcdsFixedAtBuild]
diff --git a/Drivers/OptionRomPkg/OptionRomPkg.dsc b/Drivers/OptionRomPkg/OptionRomPkg.dsc
index bb166d11c3e0..8b5a374d3a34 100644
--- a/Drivers/OptionRomPkg/OptionRomPkg.dsc
+++ b/Drivers/OptionRomPkg/OptionRomPkg.dsc
@@ -58,9 +58,6 @@ [LibraryClasses]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
 
-[LibraryClasses.AARCH64, LibraryClasses.ARM]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [LibraryClasses.ARM]
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Features/ManageabilityPkg/Include/Manageability.dsc b/Features/ManageabilityPkg/Include/Manageability.dsc
index aae343a7330c..4121bd303adc 100644
--- a/Features/ManageabilityPkg/Include/Manageability.dsc
+++ b/Features/ManageabilityPkg/Include/Manageability.dsc
@@ -14,10 +14,6 @@ [LibraryClasses.common.DXE_DRIVER]
   PldmProtocolLib|ManageabilityPkg/Library/PldmProtocolLibrary/Dxe/PldmProtocolLib.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
-  #
-  # This library provides the instrinsic functions generated by a given compiler.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
   ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 3acd3e281ce4..e10aed7ae87b 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -232,16 +232,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
 
-[LibraryClasses.ARM]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [LibraryClasses.AARCH64]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 ###################################################################################################
diff --git a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc
index 127b1e3bb729..cd0fc8069f73 100644
--- a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc
+++ b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc
@@ -81,7 +81,6 @@ [LibraryClasses.AARCH64, LibraryClasses.ARM]
   CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
 
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 [LibraryClasses.common.MM_CORE_STANDALONE]
diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
index 7d82f350bad6..ea4c1874a0e2 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -194,13 +194,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 
 
 [LibraryClasses.ARM]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index f5389e3d3c1b..592b45f5d9e3 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -224,16 +224,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
 
-[LibraryClasses.ARM]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [LibraryClasses.AARCH64]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 ###################################################################################################
diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index 9f54a8915707..89a362a7d6ca 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -95,12 +95,6 @@ [LibraryClasses.common]
   # use the accelerated BaseMemoryLibOptDxe by default, overrides for SEC/PEI below
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  #
-  # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
-  # This library provides the instrinsic functions such a compiler may generate calls to.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 43d6d028e126..dccf3e1dc206 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -107,12 +107,6 @@ [LibraryClasses.common]
   # use the accelerated BaseMemoryLibOptDxe by default, overrides for SEC/PEI below
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  #
-  # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
-  # This library provides the instrinsic functions such a compiler may generate calls to.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc
index c79f322d9e75..ced9d04d22e1 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -105,12 +105,6 @@ [LibraryClasses.common]
   # use the accelerated BaseMemoryLibOptDxe by default, overrides for SEC/PEI below
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  #
-  # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
-  # This library provides the instrinsic functions such a compiler may generate calls to.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index a9058cfdec54..6f87b5801ef0 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -119,7 +119,6 @@ [LibraryClasses.common]
   SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
   PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
 
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index bdc3972e571f..7800a44ee1f0 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -227,16 +227,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
 
-[LibraryClasses.ARM]
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the instrinsic functions generate by a given compiler.
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [LibraryClasses.AARCH64]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 ###################################################################################################
diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
index 653029c52fdb..b44307e027f3 100644
--- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
+++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
@@ -65,13 +65,6 @@ [LibraryClasses]
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
 
-  #
-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
-  # This library provides the intrinsic functions generate by a given compiler.
-  # NULL means link this library into all ARM images.
-  #
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [LibraryClasses.ARM]
   ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
 
diff --git a/Silicon/Openmoko/Openmoko.dsc b/Silicon/Openmoko/Openmoko.dsc
index c565d0425b46..8f0d90566c64 100644
--- a/Silicon/Openmoko/Openmoko.dsc
+++ b/Silicon/Openmoko/Openmoko.dsc
@@ -31,8 +31,5 @@ [LibraryClasses]
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
-[LibraryClasses.ARM]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
 [Components]
   Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf
diff --git a/Silicon/Synopsys/DesignWare/DesignWare.dsc b/Silicon/Synopsys/DesignWare/DesignWare.dsc
index b5a7b38e142e..43303cc9e381 100755
--- a/Silicon/Synopsys/DesignWare/DesignWare.dsc
+++ b/Silicon/Synopsys/DesignWare/DesignWare.dsc
@@ -30,7 +30,6 @@ [LibraryClasses]
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc b/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc
index 92c2f6a2e607..54cb551bcf99 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Silicon/TexasInstruments/Omap35xxPkg/Omap35xxPkg.dsc
@@ -74,7 +74,6 @@ [LibraryClasses.common.DXE_DRIVER]
   NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
 
 [LibraryClasses.ARM]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 [BuildOptions]
-- 
2.40.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120433): https://edk2.groups.io/g/devel/message/120433
Mute This Topic: https://groups.io/mt/108166769/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [edk2-devel] [PATCH v1 3/3] ARM Platforms: Drop ArmSoftFloatLib
  2024-08-29 18:32 [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Oliver Smith-Denny
  2024-08-29 18:32 ` [edk2-devel] [PATCH v1 1/3] Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes Oliver Smith-Denny
  2024-08-29 18:32 ` [edk2-devel] [PATCH v1 2/3] ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib Oliver Smith-Denny
@ 2024-08-29 18:32 ` Oliver Smith-Denny
  2024-08-29 18:59 ` [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Ard Biesheuvel via groups.io
  3 siblings, 0 replies; 7+ messages in thread
From: Oliver Smith-Denny @ 2024-08-29 18:32 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney

edk2 PR https://github.com/tianocore/edk2/pull/6048 has moved
ArmSoftFloatLib to MdePkg and MdeLibs.dsc.inc.

This patch removes all references to the old ArmPkg location and
relies on this coming from MdeLibs.dsc.inc. It is done in one shot
as this is a breaking change and not a functional change.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Continuous-integration-options: PatchCheck.ignore-multi-package

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
---
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                              | 3 ---
 Features/ManageabilityPkg/Include/Manageability.dsc                        | 1 -
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc                           | 3 ---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc               | 3 ---
 Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc | 3 ---
 5 files changed, 13 deletions(-)

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 4e1f73b94753..fb7f7b6e6748 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -204,9 +204,6 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64]
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
-[LibraryClasses.ARM]
-  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
-
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
diff --git a/Features/ManageabilityPkg/Include/Manageability.dsc b/Features/ManageabilityPkg/Include/Manageability.dsc
index 4121bd303adc..fa0ca795709b 100644
--- a/Features/ManageabilityPkg/Include/Manageability.dsc
+++ b/Features/ManageabilityPkg/Include/Manageability.dsc
@@ -15,7 +15,6 @@ [LibraryClasses.common.DXE_DRIVER]
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
-  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
 
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 71d7abe63e0a..d1914bc3e9ed 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -156,9 +156,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
 
-[LibraryClasses.ARM]
- ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
-
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 6f87b5801ef0..6929438b5c96 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -212,9 +212,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
 
-[LibraryClasses.ARM]
-  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
-
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
index b44307e027f3..c7a7211ce0a0 100644
--- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
+++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc
@@ -65,9 +65,6 @@ [LibraryClasses]
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
 
-[LibraryClasses.ARM]
-  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
-
 [LibraryClasses.common.MM_STANDALONE]
   HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf
   MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf
-- 
2.40.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120434): https://edk2.groups.io/g/devel/message/120434
Mute This Topic: https://groups.io/mt/108166770/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs
  2024-08-29 18:32 [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Oliver Smith-Denny
                   ` (2 preceding siblings ...)
  2024-08-29 18:32 ` [edk2-devel] [PATCH v1 3/3] ARM Platforms: Drop ArmSoftFloatLib Oliver Smith-Denny
@ 2024-08-29 18:59 ` Ard Biesheuvel via groups.io
  2024-09-12 17:02   ` Ard Biesheuvel via groups.io
  3 siblings, 1 reply; 7+ messages in thread
From: Ard Biesheuvel via groups.io @ 2024-08-29 18:59 UTC (permalink / raw)
  To: Oliver Smith-Denny; +Cc: devel, Ard Biesheuvel, Leif Lindholm, Michael D Kinney

On Thu, 29 Aug 2024 at 20:33, Oliver Smith-Denny
<osde@linux.microsoft.com> wrote:
>
> edk2 PR https://github.com/tianocore/edk2/pull/6048 moved some architectural pieces
> from ArmPkg to MdePkg. This patch updates all platforms (& etc.) in edk2-platforms
> to use the MdePkg versions of these libs.
>
> This patch is dependent on the above edk2 merging and must not be merged before that
> goes in.
>
> It's been a little while since I've sent a patch on the mailing list, so hopefully I
> have everything right :).
>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>
> Oliver Smith-Denny (3):
>   Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes
>   ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib
>   ARM Platforms: Drop ArmSoftFloatLib
>

For the series,

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

Let me know if/when you need my help merging this.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120435): https://edk2.groups.io/g/devel/message/120435
Mute This Topic: https://groups.io/mt/108166767/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs
  2024-08-29 18:59 ` [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Ard Biesheuvel via groups.io
@ 2024-09-12 17:02   ` Ard Biesheuvel via groups.io
  2024-09-12 17:32     ` Oliver Smith-Denny
  0 siblings, 1 reply; 7+ messages in thread
From: Ard Biesheuvel via groups.io @ 2024-09-12 17:02 UTC (permalink / raw)
  To: Oliver Smith-Denny; +Cc: devel, Ard Biesheuvel, Leif Lindholm, Michael D Kinney

On Thu, 29 Aug 2024 at 20:59, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> On Thu, 29 Aug 2024 at 20:33, Oliver Smith-Denny
> <osde@linux.microsoft.com> wrote:
> >
> > edk2 PR https://github.com/tianocore/edk2/pull/6048 moved some architectural pieces
> > from ArmPkg to MdePkg. This patch updates all platforms (& etc.) in edk2-platforms
> > to use the MdePkg versions of these libs.
> >
> > This patch is dependent on the above edk2 merging and must not be merged before that
> > goes in.
> >
> > It's been a little while since I've sent a patch on the mailing list, so hopefully I
> > have everything right :).
> >
> > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> >
> > Oliver Smith-Denny (3):
> >   Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes
> >   ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib
> >   ARM Platforms: Drop ArmSoftFloatLib
> >
>
> For the series,
>
> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
>
> Let me know if/when you need my help merging this.

I take it this will need a respin to drop the Arm/ and AArch64/ prefixes too?

Also, we moved to GitHub PRs for this repo in the meantime so no need
to resend it to the list.

Thanks,
Ard.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120558): https://edk2.groups.io/g/devel/message/120558
Mute This Topic: https://groups.io/mt/108166767/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs
  2024-09-12 17:02   ` Ard Biesheuvel via groups.io
@ 2024-09-12 17:32     ` Oliver Smith-Denny
  0 siblings, 0 replies; 7+ messages in thread
From: Oliver Smith-Denny @ 2024-09-12 17:32 UTC (permalink / raw)
  To: devel, ardb; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney

On 9/12/2024 10:02 AM, Ard Biesheuvel via groups.io wrote:
> On Thu, 29 Aug 2024 at 20:59, Ard Biesheuvel <ardb@kernel.org> wrote:
>>
>> On Thu, 29 Aug 2024 at 20:33, Oliver Smith-Denny
>> <osde@linux.microsoft.com> wrote:
>>>
>>> edk2 PR https://github.com/tianocore/edk2/pull/6048 moved some architectural pieces
>>> from ArmPkg to MdePkg. This patch updates all platforms (& etc.) in edk2-platforms
>>> to use the MdePkg versions of these libs.
>>>
>>> This patch is dependent on the above edk2 merging and must not be merged before that
>>> goes in.
>>>
>>> It's been a little while since I've sent a patch on the mailing list, so hopefully I
>>> have everything right :).
>>>
>>> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
>>> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
>>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>>>
>>> Oliver Smith-Denny (3):
>>>    Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes
>>>    ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib
>>>    ARM Platforms: Drop ArmSoftFloatLib
>>>
>>
>> For the series,
>>
>> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
>>
>> Let me know if/when you need my help merging this.
> 
> I take it this will need a respin to drop the Arm/ and AArch64/ prefixes too?
> 
> Also, we moved to GitHub PRs for this repo in the meantime so no need
> to resend it to the list.
> 

Great, I will put up a PR for this minus the ArmSoftFloatLib stuff.

Thanks,
Oliver


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120559): https://edk2.groups.io/g/devel/message/120559
Mute This Topic: https://groups.io/mt/108166767/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-09-12 17:32 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-29 18:32 [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Oliver Smith-Denny
2024-08-29 18:32 ` [edk2-devel] [PATCH v1 1/3] Arm/AARCH64 Platforms: Update AsmMacroLib.h Includes Oliver Smith-Denny
2024-08-29 18:32 ` [edk2-devel] [PATCH v1 2/3] ARM/AARCH64 Platforms: Drop ArmCompilerIntrinsicsLib Oliver Smith-Denny
2024-08-29 18:32 ` [edk2-devel] [PATCH v1 3/3] ARM Platforms: Drop ArmSoftFloatLib Oliver Smith-Denny
2024-08-29 18:59 ` [edk2-devel][PATCH v1 0/3] Update to MdePkg Versions of ARM/AARCH64 Libs Ard Biesheuvel via groups.io
2024-09-12 17:02   ` Ard Biesheuvel via groups.io
2024-09-12 17:32     ` Oliver Smith-Denny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox