From patchwork Thu Feb 8 19:30:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 127743 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1798182ljc; Thu, 8 Feb 2018 11:30:31 -0800 (PST) X-Google-Smtp-Source: AH8x224K5IgmwRH4f6B2noC0D8WkRPgGq42QYZi2XA5B8zzTJTFRAUkKq4vsGcDkCJepnXW5xs8m X-Received: by 2002:a17:902:42a5:: with SMTP id h34-v6mr85226pld.265.1518118231682; Thu, 08 Feb 2018 11:30:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518118231; cv=none; d=google.com; s=arc-20160816; b=J9LGnini8ba/WZhD3IRvT5yzhbcxOg/hqRk5aC/8xWLaRvKpGgPuZQn2s8GPlFcObb MWfK2gbs8vTxd7RmkZQPkee89qCMiKf1K32DPsR+wSeocLmPNvxrU1akC8dWJpYuDnRy IGIIXe5098eUBsMC0xNjB/MM6xVnpTGgHo3e1SvaMlxcLKe56GANCsNqR6E6qfqR3P6K mItM38hgh6KsCSIo8NdM5dd4jnHILEdfDEPU/jGjrH92Ynyr/JpFrziTSrs//xhbzqC8 QD+PVOMVn6gOxGoeXnCONwuGNyLRttCGkddgboVar77wWuADHQtxzCt6AqR6s3xtSfvj q4iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=OqquYISqqlIhLcYym5QhIi4Q0u8JENEsYjrWl+LiPXY=; b=RaAHantWvoA1iTWiC/RnNLQQDzPHxDj3MR6+MN6JHOqlmTj6c2c8UTSs/MKuj540Nw CV5FQMAEObgek4dX/DT/IzKtyLUpAsCliYfOBmIxaNC+ebEqvnrB52TvrV/BwLroD6zj ugettyFHQl4JeN5vn8eaKisidEyEDIDDp5GjyDPeImoak3RazV6lm1dK/THKddOMu+zm wpp2kJ/EyWGtJ8diZZ4fxbeXPsQ8XgZWGf/EoQ+8JDwFOgMF6nUeMYRpd+HY/982eAUo /tT3ZNZzx40/68Lm/euDzIYYevqJOtUiRxNTlPn1HJpk6pGWs8FR8eddxHTn/gH7tnyJ 8jMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SleZLe4p; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id b24si413664pfd.321.2018.02.08.11.30.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 11:30:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SleZLe4p; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B77AF222DE15E; Thu, 8 Feb 2018 11:24:44 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org 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 DE326222DE159 for ; Thu, 8 Feb 2018 11:24:42 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id j21so822821wmh.1 for ; Thu, 08 Feb 2018 11:30:28 -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=5T3E/PCVqCBYEYApOrFpySTXZPDz2IV1X2WVP4U/hIQ=; b=SleZLe4peNRdqEqmmutFDQdkH1xGU3hfL7x+8oacntQKKv5Hw71s2ajMD4kTwG4BPW P4LFgg898HvRuJGUT37xrdqOAPLDOnPyB7i1RlgkXLqOCT0KEicrxQgusvKHisjTLnKc U1Wf6rxkUJmhFfesIWh5UIu1EeUsKSi73cVD8= 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=5T3E/PCVqCBYEYApOrFpySTXZPDz2IV1X2WVP4U/hIQ=; b=oHfk6H54809HAstbJxCLyR/YAHZqnPt190a5mZgiyxnKG34gmwXP4VSWkr7c4olahN GyLEpKs7fM8tqHg10qU2aAWaoP6xrPYU5ebuamL9RcMWhWhPHBnOcnH0Cmfz9bV4Tt9m t6kXD1SoYxjPT0KpIrOJK/WDg+PEQ650ADY1waLmmLLvrDusL/17B/SlhN5M8eQFeBBL WPzBzKZu9zQMXTIMLBUoacku+GFljjH9AdRFQJjtWt7rdx+OLAb+upuuUF0IgGxV+v4n tOk9ZOQqv17fQE+W/1ucdF+A8MOggSln+I7we4CdAWcUbb2Ul0zR09K3HnhaYDonCk0R zJnw== X-Gm-Message-State: APf1xPDBSum9hv4j/28dqDJo77Apx/tiIYzUnQgCDrAQpRDYWD3HGOTZ ebS7c7ZgXheUREQMj106zIcDyr1/4dI= X-Received: by 10.28.216.149 with SMTP id p143mr112635wmg.80.1518118226643; Thu, 08 Feb 2018 11:30:26 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 11:30:25 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Thu, 8 Feb 2018 19:30:21 +0000 Message-Id: <20180208193021.24524-3-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: [edk2] [PATCH edk2-platforms 3/3] (Platform/Silicon)/Hisilicon: 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: , Cc: ard.biesheuvel@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf | 3 --- Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c | 6 +----- .../Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 3 --- .../Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c | 6 +----- .../Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 3 --- 5 files changed, 2 insertions(+), 19 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf index 79723d3b17..6a47a4501e 100644 --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf @@ -41,9 +41,6 @@ [Sources.common] [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 c388a7a5ab..0f6ad89a02 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 0a3a6c1bb7..706497584e 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf @@ -45,9 +45,6 @@ [Sources.common] [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 b7bc75dc74..c5a745a44b 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 23eca287fe..b31ea41f51 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf @@ -41,9 +41,6 @@ [Sources.common] [Sources.AARCH64] AArch64/Helper.S -[FeaturePcd] - gEmbeddedTokenSpaceGuid.PcdCacheEnable - [FixedPcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize