diff mbox

[Linaro-uefi,linaro-uefi,v5,07/44] Hisilicon: Remove ArmVExpress including from build option

Message ID 1480652017-31676-8-git-send-email-heyi.guo@linaro.org
State Accepted
Commit 8c8968909d4e8f723b4a3793806f6aba77beb4b2
Headers show

Commit Message

gary guo Dec. 2, 2016, 4:13 a.m. UTC 
1. D02/D03: Remove ARMVExpressPkg platform include path from build option.
2. Delete ArmPlatform.h header which is not used by Hisilicon platforms.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.com>
---
 Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c    | 1 -
 Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c | 1 -
 Platforms/Hisilicon/D02/Pv660D02.dsc                                | 2 +-
 Platforms/Hisilicon/D03/D03.dsc                                     | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
index 6c85958..07ab0d1 100644
--- a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
+++ b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
@@ -23,7 +23,6 @@ 
 
 #include <Ppi/ArmMpCoreInfo.h>
 
-#include <ArmPlatform.h>
 UINTN
 ArmGetCpuCountPerCluster (
   VOID
diff --git a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c
index 5bbcab3..b7bc75d 100644
--- a/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c
+++ b/Chips/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c
@@ -22,7 +22,6 @@ 
 #include <Library/PcdLib.h>
 #include <Library/IoLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <ArmPlatform.h>
 
 #include <Library/OemSetVirtualMapDesc.h>
 
diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc
index 8f840a1..9c23fa7 100644
--- a/Platforms/Hisilicon/D02/Pv660D02.dsc
+++ b/Platforms/Hisilicon/D02/Pv660D02.dsc
@@ -86,7 +86,7 @@ 
   I2CLib|OpenPlatformPkg/Chips/Hisilicon/Library/I2CLib/I2CLibRuntime.inf
 
 [BuildOptions]
-  GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Pv660/Include
+  GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Pv660/Include
 
 
 ################################################################################
diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc
index 1c0d8e8..e7b8bdd 100644
--- a/Platforms/Hisilicon/D03/D03.dsc
+++ b/Platforms/Hisilicon/D03/D03.dsc
@@ -98,7 +98,7 @@ 
   SerialPortLib|OpenPlatformPkg/Chips/Hisilicon/Binary/Hi1610/Library/Uart/LpcSerialPortLib/LpcSerialPortLib.inf
 
 [BuildOptions]
-  GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Hi1610/Include
+  GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/OpenPlatformPkg/Chips/Hisilicon/Hi1610/Include
 
 ################################################################################
 #