Remove all dependencies on ArmPkg's BaseMemoryLibStm, which is deprecated and will be removed.
Ard Biesheuvel (5): Platforms/AMD/Styx: switch to MdePkg versions of BaseMemoryLib Platforms/Hisilicon/Pv660: move to MdePkg version of BaseMemoryLib Platforms/ARM: move to MdePkg version of BaseMemoryLib Platforms/Marvell/Armada: move to MdePkg version of BaseMemoryLib Platforms/TI/BeagleBoard: remove dependency on ArmPkg/BaseMemoryLibStm
Chips/Hisilicon/Pv660/Pv660.dsc.inc | 7 ++++--- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 6 +++--- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 6 +++--- Platforms/Marvell/Armada/Armada.dsc.inc | 5 +++-- Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-)
This switches Overdrive and Cello to the MdePkg versions of BaseMemoryLib, which have recently been updated to support AARCH64 (as well as ARM).
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 6 +++--- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 0a987cc3b118..52f0c884e45d 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -76,9 +76,7 @@ DEFINE DO_KCS = 0 PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
- # 1/123 faster than Stm or Vstm version - #BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
# Networking Requirements NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf @@ -166,8 +164,10 @@ DEFINE DO_KCS = 0
[LibraryClasses.common.PEIM, LibraryClasses.common.SEC] MemoryInitPeiLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.PEI_CORE] + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 72ceb8b6994e..be61d2ac3227 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -79,9 +79,7 @@ DEFINE DO_KCS = 1 PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
- # 1/123 faster than Stm or Vstm version - #BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
# Networking Requirements NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf @@ -173,8 +171,10 @@ DEFINE DO_KCS = 1
[LibraryClasses.common.PEIM, LibraryClasses.common.SEC] MemoryInitPeiLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.PEI_CORE] + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
Move away from ArmPkg's BaseMemoryLibStm, which is deprecated and about to be removed. For SEC and PEI phases, move to the generic MdePkg version instead, and for later phases, use the accelerated BaseMemoryLibOptDxe implementation.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Chips/Hisilicon/Pv660/Pv660.dsc.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Chips/Hisilicon/Pv660/Pv660.dsc.inc b/Chips/Hisilicon/Pv660/Pv660.dsc.inc index 5c38fb42f5ca..d9ef1158faff 100644 --- a/Chips/Hisilicon/Pv660/Pv660.dsc.inc +++ b/Chips/Hisilicon/Pv660/Pv660.dsc.inc @@ -51,9 +51,7 @@ # PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
- # 1/123 faster than Stm or Vstm version - #BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
# ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf @@ -140,6 +138,7 @@
ArmGicArchLib|ArmPkg/Library/ArmGicArchSecLib/ArmGicArchSecLib.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -155,6 +154,7 @@
PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -175,6 +175,7 @@ PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
Move away from ArmPkg's BaseMemoryLibStm, which is deprecated and about to be removed. For SEC and PEI phases, move to the generic MdePkg version instead, and for later phases, use the accelerated BaseMemoryLibOptDxe implementation.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index bfd94c3a2df4..823c934f3159 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -58,9 +58,7 @@ # PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
- # 1/123 faster than Stm or Vstm version - #BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
# Networking Requirements NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf @@ -192,6 +190,7 @@ ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -210,6 +209,7 @@
[LibraryClasses.common.SEC, LibraryClasses.common.PEIM] MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
Move away from ArmPkg's BaseMemoryLibStm, which is deprecated and about to be removed. For SEC and PEI phases, move to the generic MdePkg version instead, and for later phases, use the accelerated BaseMemoryLibOptDxe implementation.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/Marvell/Armada/Armada.dsc.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Platforms/Marvell/Armada/Armada.dsc.inc b/Platforms/Marvell/Armada/Armada.dsc.inc index 47934b2ea950..58c958587fc9 100644 --- a/Platforms/Marvell/Armada/Armada.dsc.inc +++ b/Platforms/Marvell/Armada/Armada.dsc.inc @@ -68,8 +68,7 @@ # Assume everything is fixed at build. do not use runtime PCD feature PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
- # 1/123 faster than Stm or Vstm version - BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
# ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf @@ -135,6 +134,7 @@ 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
[LibraryClasses.common.SEC] DebugAgentLib|ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf @@ -151,6 +151,7 @@
[LibraryClasses.common.SEC, LibraryClasses.common.PEIM] MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
The library BaseMemoryLibStm in ArmPkg is deprecated and is going to be removed. Move to the generic version in MdePkg instead.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc b/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc index bd1326725fd2..f04aa983d307 100644 --- a/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc +++ b/Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc @@ -54,7 +54,7 @@ MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
EfiResetSystemLib|OpenPlatformPkg/Platforms/TexasInstruments/BeagleBoard/Library/ResetSystemLib/ResetSystemLib.inf
On 21 September 2016 at 09:23, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:
Move away from ArmPkg's BaseMemoryLibStm, which is deprecated and about to be removed. For SEC and PEI phases, move to the generic MdePkg version instead, and for later phases, use the accelerated BaseMemoryLibOptDxe implementation.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org
Tested-by: Ryan Harkin ryan.harkin@linaro.org
Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index bfd94c3a2df4..823c934f3159 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -58,9 +58,7 @@ # PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
- # 1/123 faster than Stm or Vstm version
- #BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
- BaseMemoryLib|ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
# Networking Requirements NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
@@ -192,6 +190,7 @@ ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
- BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -210,6 +209,7 @@
[LibraryClasses.common.SEC, LibraryClasses.common.PEIM] MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
- BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf -- 2.7.4
On 11 October 2016 at 13:31, Ryan Harkin ryan.harkin@linaro.org wrote:
On 21 September 2016 at 09:23, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:
Move away from ArmPkg's BaseMemoryLibStm, which is deprecated and about to be removed. For SEC and PEI phases, move to the generic MdePkg version instead, and for later phases, use the accelerated BaseMemoryLibOptDxe implementation.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org
Tested-by: Ryan Harkin ryan.harkin@linaro.org
Pushed, thanks.
On 21 September 2016 at 09:23, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:
Remove all dependencies on ArmPkg's BaseMemoryLibStm, which is deprecated and will be removed.
Ping?
Ard Biesheuvel (5): Platforms/AMD/Styx: switch to MdePkg versions of BaseMemoryLib Platforms/Hisilicon/Pv660: move to MdePkg version of BaseMemoryLib Platforms/ARM: move to MdePkg version of BaseMemoryLib Platforms/Marvell/Armada: move to MdePkg version of BaseMemoryLib Platforms/TI/BeagleBoard: remove dependency on ArmPkg/BaseMemoryLibStm
Chips/Hisilicon/Pv660/Pv660.dsc.inc | 7 ++++--- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 6 +++--- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 6 +++--- Platforms/Marvell/Armada/Armada.dsc.inc | 5 +++-- Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-)
-- 2.7.4
On 24 October 2016 at 15:00, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:
On 21 September 2016 at 09:23, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:
Remove all dependencies on ArmPkg's BaseMemoryLibStm, which is deprecated and will be removed.
Ping?
Ah, apologies, this hit me during plugfest. Reviewed-by: Leif Lindholm leif.lindholm@linaro.org
Ard Biesheuvel (5): Platforms/AMD/Styx: switch to MdePkg versions of BaseMemoryLib Platforms/Hisilicon/Pv660: move to MdePkg version of BaseMemoryLib Platforms/ARM: move to MdePkg version of BaseMemoryLib Platforms/Marvell/Armada: move to MdePkg version of BaseMemoryLib Platforms/TI/BeagleBoard: remove dependency on ArmPkg/BaseMemoryLibStm
Chips/Hisilicon/Pv660/Pv660.dsc.inc | 7 ++++--- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 6 +++--- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 6 +++--- Platforms/Marvell/Armada/Armada.dsc.inc | 5 +++-- Platforms/TexasInstruments/BeagleBoard/BeagleBoardPkg.dsc | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-)
-- 2.7.4
-
Ard Biesheuvel -
Leif Lindholm -
Ryan Harkin