On 3 April 2017 at 15:57, Leif Lindholm leif.lindholm@linaro.org wrote:

On Fri, Mar 31, 2017 at 09:50:35AM +0100, Ard Biesheuvel wrote:

...

ArmCpuLib is on its way out ...

Oh, come on...

My bad

"The very limited functionality of ArmCpuLib has to large extent been superseded by earlier stage firmware, and the remainder refactored out. In preparation for deleting the component from edk2, drop all references to it from OpenPlatformPkg."

With that: Reviewed-by: Leif Lindholm leif.lindholm@linaro.org

Thanks. Pushed as 147b3bbc8bec

...

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org

---

Note: build testing appreciated but hardly required -- runtime testing this is completely pointless imo

Chips/Hisilicon/Hisilicon.dsc.inc | 3 --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 1 - Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 1 - Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 1 - Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 1 - Platforms/Marvell/Armada/Armada.dsc.inc | 1 - 6 files changed, 8 deletions(-)

diff --git a/Chips/Hisilicon/Hisilicon.dsc.inc b/Chips/Hisilicon/Hisilicon.dsc.inc index 4c6eea0ea428..d856a659a8fb 100644 --- a/Chips/Hisilicon/Hisilicon.dsc.inc +++ b/Chips/Hisilicon/Hisilicon.dsc.inc @@ -115,9 +115,6 @@ ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

• # Use ArmCortexA5xLib to get A57 specific functions
• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.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.

diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 355442bcfca6..f068713bf0b8 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -98,7 +98,6 @@ DEFINE DO_KCS = 0 PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf

ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmPlatformLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc index e245b536dde1..f723452ad2f2 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc @@ -100,7 +100,6 @@ DEFINE DO_KCS = 1 PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf

ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmPlatformLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 53c7d67bd9b6..caae1a9a3af1 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -101,7 +101,6 @@ DEFINE DO_KCS = 1 PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf

ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmPlatformLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index cde718168f18..3021e21576f9 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -41,7 +41,6 @@

[LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf

diff --git a/Platforms/Marvell/Armada/Armada.dsc.inc b/Platforms/Marvell/Armada/Armada.dsc.inc index c16bf4c9560c..bdaf53710d9b 100644 --- a/Platforms/Marvell/Armada/Armada.dsc.inc +++ b/Platforms/Marvell/Armada/Armada.dsc.inc @@ -138,7 +138,6 @@ [LibraryClasses.AARCH64] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf

• ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-- 2.9.3