From ebe08785aec9996523852c7bc306c58b01cac51f Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 8 Feb 2018 19:26:13 +0000 Subject: [PATCH] (Platform/Silicon)/Hisilicon: drop use of PcdCacheEnabled PcdCacheEnabled was never useful for these platforms, but it was copied over from other platforms used as templates. Delete it here to keep the platforms building once the Pcd is removed from EmbeddedPkg. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm Reviewed-by: Ard Biesheuvel --- Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf | 3 --- Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c | 6 +----- .../Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 3 --- .../Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c | 6 +----- .../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 3 --- 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf index 79723d3b175..6a47a4501e3 100644 --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf @@ -41,9 +41,6 @@ [Sources.AARCH64] HiKeyHelper.S -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmTokenSpaceGuid.PcdArmPrimaryCore gArmTokenSpaceGuid.PcdArmPrimaryCoreMask diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c index c388a7a5abc..0f6ad89a025 100644 --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c @@ -164,11 +164,7 @@ ArmPlatformGetVirtualMemoryMap ( return; } - if (FeaturePcdGet(PcdCacheEnable) == TRUE) { - CacheAttributes = DDR_ATTRIBUTES_CACHED; - } else { - CacheAttributes = DDR_ATTRIBUTES_UNCACHED; - } + CacheAttributes = DDR_ATTRIBUTES_CACHED; Index = 0; diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf index 0a3a6c1bb71..706497584e7 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf @@ -45,9 +45,6 @@ [Sources.AARCH64] AArch64/Helper.S -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c index b7bc75dc743..c5a745a44b7 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c @@ -58,11 +58,7 @@ ArmPlatformGetVirtualMemoryMap ( return; } - if (FeaturePcdGet(PcdCacheEnable) == TRUE) { - CacheAttributes = DDR_ATTRIBUTES_CACHED; - } else { - CacheAttributes = DDR_ATTRIBUTES_UNCACHED; - } + CacheAttributes = DDR_ATTRIBUTES_CACHED; Index = OemSetVirtualMapDesc(VirtualMemoryTable, CacheAttributes); diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf index 23eca287fe5..b31ea41f51f 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf @@ -41,9 +41,6 @@ [Sources.AARCH64] AArch64/Helper.S -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize