From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 48D4B222DE133 for ; Thu, 8 Feb 2018 11:24:41 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id g1so11458800wmg.2 for ; Thu, 08 Feb 2018 11:30:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G08w2Mb2VDe4SOYMhax59BElGHc5NHfp555E93xCmt8=; b=MVpyg10Bx+fIK36wmZjJTK+q+KB8ulAj01s3zgYIm4QU6My7QCc5nJWzDtFwgkQcOm vziBRFZIUogvRkaAacMGYnxRuLlVwW4pIDx2eazt96+6IOqxI0B4RcK+jHcvCrfqG2sf DYVtJaNI27DT7Tv2kRyPpbY3TYvyjChg2OmW0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G08w2Mb2VDe4SOYMhax59BElGHc5NHfp555E93xCmt8=; b=UDGeG/BusSSGe4j1SXgCO11p6pLUzR9l4Mzc9o7EtcLEIOll37geiJA2tkAdDotWW3 10V741N5K5qdUKJT8xuwA2+QT3lQHGBk6BnNCAISToMKz7QqazGjpIK3s7rzx86zTq6D cM+8aUp1dQIhwBSPmI4Dw39AxtC3oGKb8tJhKjwjInPKFXQNCmkcQc8UiZhUXKjls0ZA Y2FnpkXUT1PBFAE4tKoq/kdZiTVlRJ2FgjO7sKBynDLaJJQbLdV1Mbm1tsr/X+6PX4fq DKzuKDOK6xqb/I/IAiKFvejH2nsD7IE+NS8LiMu6eOp+dK4as795VvtvxxtO5gmU041I XAqw== X-Gm-Message-State: APf1xPCbDApodx/bB+KbgOwCS8LrMESUBdZrXY+WXXqPC2LCdyyXOwa0 1baJF1XO+2zXQUOz6CBBiYq5zRLk2VA= X-Google-Smtp-Source: AH8x224bsNwMX5fhsEWtoCYqrD7JfSzIQcvWUDUXWhMrC7NRR/pY8Cq2d62uY6+VJ/IPlk8VCZ/C/A== X-Received: by 10.28.182.5 with SMTP id g5mr111426wmf.44.1518118224840; Thu, 08 Feb 2018 11:30:24 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id s9sm805758wra.4.2018.02.08.11.30.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 11:30:23 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Cc: ard.biesheuvel@linaro.org Date: Thu, 8 Feb 2018 19:30:20 +0000 Message-Id: <20180208193021.24524-2-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180208193021.24524-1-leif.lindholm@linaro.org> References: <20180208193021.24524-1-leif.lindholm@linaro.org> Subject: [PATCH edk2-platforms 2/3] Platform/ARM: drop use of PcdCacheEnabled X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Feb 2018 19:24:41 -0000 PcdCacheEnabled does nothing useful for these platforms. Delete all uses of 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 --- Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 3 --- Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c | 6 +----- .../VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 3 --- .../ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c | 6 +----- .../ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf | 3 --- .../VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 3 --- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c | 4 +--- 7 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf index 2dd384daba..d3fc9b6cc7 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf @@ -43,9 +43,6 @@ [Sources.AARCH64] [Sources.ARM] Arm/ArmJunoHelper.S | GCC -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c index aa8d7d9c3b..2d9c2c95a8 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c @@ -72,11 +72,7 @@ ArmPlatformGetVirtualMemoryMap ( return; } - if (FeaturePcdGet(PcdCacheEnable) == TRUE) { - CacheAttributes = DDR_ATTRIBUTES_CACHED; - } else { - CacheAttributes = DDR_ATTRIBUTES_UNCACHED; - } + CacheAttributes = DDR_ATTRIBUTES_CACHED; // SMB CS0 - NOR0 Flash VirtualMemoryTable[Index].PhysicalBase = ARM_VE_SMB_NOR0_BASE; diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf index 9e81b1c1cc..329f80dcfe 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf @@ -40,9 +40,6 @@ [Sources.common] CTA15-A7Helper.asm | RVCT CTA15-A7Helper.S | GCC -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c index 4403cbacb8..05e9abc572 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c @@ -53,11 +53,7 @@ ArmPlatformGetVirtualMemoryMap ( return; } - if (FeaturePcdGet(PcdCacheEnable) == TRUE) { - CacheAttributes = DDR_ATTRIBUTES_CACHED; - } else { - CacheAttributes = DDR_ATTRIBUTES_UNCACHED; - } + CacheAttributes = DDR_ATTRIBUTES_CACHED; #ifdef ARM_BIGLITTLE_TC2 // Secure NOR0 Flash diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf index 4cbd2ff4b4..8c6291c42f 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf @@ -45,9 +45,6 @@ [Sources.ARM] [Sources.AARCH64] AArch64/RTSMHelper.S -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf index 269760f8ba..2287756cf8 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf @@ -41,9 +41,6 @@ [Sources.ARM] [Sources.AARCH64] AArch64/RTSMHelper.S -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c index 6379e81751..9fb0803d31 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c @@ -90,9 +90,7 @@ ArmPlatformGetVirtualMemoryMap ( return; } - CacheAttributes = (FeaturePcdGet(PcdCacheEnable)) - ? DDR_ATTRIBUTES_CACHED - : DDR_ATTRIBUTES_UNCACHED; + CacheAttributes = DDR_ATTRIBUTES_CACHED; // ReMap (Either NOR Flash or DRAM) VirtualMemoryTable[Index].PhysicalBase = ARM_VE_REMAP_BASE; -- 2.11.0