commit 858605ed2a5475768341ff5ea4f5a2c232336ee0
author Ard Biesheuvel <ard.biesheuvel@linaro.org> Mon Sep 05 14:23:17 2016 +0100
committer Ard Biesheuvel <ard.biesheuvel@linaro.org> Thu Sep 08 09:28:16 2016 +0100
tree c029ac87d12f4d6d886f47dbe42b3d2802cbb765
parent f6665dccb1db5cfdc1c17cd49b3c8344c2cdf36e

Hisilicon/D0x: switch to ArmBaseLib

Replace all references to the various ArmLib flavors with ArmBaseLib, which
can substitute for all of them.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Platforms/Hisilicon/D02/Pv660D02.dsc

diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc
index b9ccfd4..f9ee89f 100644
--- a/Platforms/Hisilicon/D02/Pv660D02.dsc
+++ b/Platforms/Hisilicon/D02/Pv660D02.dsc
@@ -34,7 +34,7 @@
 !include OpenPlatformPkg/Chips/Hisilicon/Pv660/Pv660.dsc.inc

 

 [LibraryClasses.common]

-  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf

+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

   ArmPlatformLib|OpenPlatformPkg/Chips/Hisilicon/Library/ArmPlatformLibPv660/ArmPlatformLib.inf

 

   ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf

@@ -74,7 +74,6 @@
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

 

 [LibraryClasses.common.SEC]

-  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf

   ArmPlatformLib|OpenPlatformPkg/Chips/Hisilicon/Library/ArmPlatformLibPv660/ArmPlatformLibSec.inf

 

 [LibraryClasses.common.DXE_RUNTIME_DRIVER]

Platforms/Hisilicon/D03/D03.dsc

diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc
index 30a1e6a..fb3d8d1 100644
--- a/Platforms/Hisilicon/D03/D03.dsc
+++ b/Platforms/Hisilicon/D03/D03.dsc
@@ -34,7 +34,7 @@
 !include OpenPlatformPkg/Chips/Hisilicon/Pv660/Pv660.dsc.inc

 

 [LibraryClasses.common]

-  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf

+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

   ArmPlatformLib|OpenPlatformPkg/Chips/Hisilicon/Library/ArmPlatformLibPv660/ArmPlatformLib.inf

 

   ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf

@@ -83,7 +83,6 @@
   LpcLib|OpenPlatformPkg/Chips/Hisilicon/Binary/Hi1610/Library/LpcLib/LpcLib.inf

   SerialPortLib|OpenPlatformPkg/Chips/Hisilicon/Binary/Hi1610/Library/Uart/LpcSerialPortLib/LpcSerialPortLib.inf

 [LibraryClasses.common.SEC]

-  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf

   ArmPlatformLib|OpenPlatformPkg/Chips/Hisilicon/Library/ArmPlatformLibPv660/ArmPlatformLibSec.inf