From patchwork Fri Dec 8 17:21:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 121219 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp919186qgn; Fri, 8 Dec 2017 09:21:59 -0800 (PST) X-Google-Smtp-Source: AGs4zMYWV+1Cq1aB5S9Ax9Od5KEuVAis5AMlNvFVli/LsyajkPkqv5OjD6zICotBqDfQZjPVaCFF X-Received: by 10.84.171.193 with SMTP id l59mr30386090plb.163.1512753719391; Fri, 08 Dec 2017 09:21:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512753719; cv=none; d=google.com; s=arc-20160816; b=Mu/4GLpdDPjAuF5LiolxFjYi3/5EtOoGU8iZbP+VjQmWZdJozklKH3ggvYqxV9cZBf iX26A0dGiPVyMLnCUmxrMmdOYPfgoJgF/1EumhR3I791iu8KjejtsXL4LX2dfzfKopOW NbCVD/k5y9v+5wLuE+nbmqaSfgwNRe1fh9xqCklYKuoo/kM7bF/Fsm5dzmDdiq+j2A8X /zZtBbb9HwHcbxovVpsNR+jyBH2TiESv7sDm+DLKtL5pWwchU0s0UkObwbEIy5LYybS2 1NOHz+MjNFEQjITXKRsjXm1tr76Z1rg8tlnViM0dVnn3a9Z/Zj316BX1qCDaivt9/PSW 2W6w== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=St3dMAo+oe9mOKttu5QLGnA2+YSMdKQ4zke5Dl73U9U=; b=wYrUyMFYKGmBQ8kEItO9o/eHf9i+UY9seJzaFCqbJc6TWxuuScwtPG6EfOQG4XG8CY N5JdkpLmVDqq4tOvd82md8HIbXEG+t8ZN3tIkkCx3c0LFcGl4z5AcsF5Y7Cwi3k5qy96 uefspD8AXjSXUQxiBgIVGMG7CPNMMDD27hl0K7xY50lWRBCy7sbozM586QwzU3bMhiQi ypvKfZmMlEOAymWdIDNXMimbVWafuNXU/Ft2JV8BYS2hY5B1SfvV2HSpY7cEuQ6U1cIE Sbo5K2ooHCJMwQv0lYU99Uaygi2NU7AV0sXvmCiksba5CvZ2Jm9CjbN1O2cOCM0gXKNS PIlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Cpwi4Tfe; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id h8si5742021pgq.287.2017.12.08.09.21.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 09:21:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Cpwi4Tfe; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 12B64221EA0BC; Fri, 8 Dec 2017 09:17:24 -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::242; helo=mail-wm0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 B79C121B0284C for ; Fri, 8 Dec 2017 09:17:22 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id t8so4397679wmc.3 for ; Fri, 08 Dec 2017 09:21:57 -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; bh=Y6105I8aUlbDtt4JnBsHB1Lwhf6I/rVqw/qQB59ttIU=; b=Cpwi4Tfe88hq9V7nYbvHMbYjOaCf7D+NbfCIlhtAaHasdhLE+A2SmZEf/3OiRTRiC0 aK/lmHleHYMSzH8q+niGdNu0SWDQerv+RcDrq6GHL4JXmWv/BvYyhupS2TSMJNsjo+NA JmSJaNwVakfJ/G20WLBrhb05Cw9H+grb5t0e0= 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; bh=Y6105I8aUlbDtt4JnBsHB1Lwhf6I/rVqw/qQB59ttIU=; b=O11uybuq5XdfaJCBhudjW3ZGmJVrcr9rc0Q8J7GVK9gySI1W/jx6vOYR+v/FQW0G6v 1WTHzLgOfHYvPrRXCPjBlaC0d/hCstHjUIrRxBet2H+e4xtBVoltePXKPA8cC92A7juR CDb7b99B+mQ2mbsFbrtBvFnc0JFxzT+baxhVMXQ3wf2DIDmDCBoNJDvuos7bEzcarg1V HeNrIzgV2wadztHDXPqXjhzL48LumjgEzTFx8EN2ANvs9ENOwjq41t8UVRmKmQaDLS08 auua/uqLb/DtuTs5qEVbV2X1mnW2awNSXyPFC5Z/mgj40tfNnN8HBeLR2uSQed/izZNe KYTQ== X-Gm-Message-State: AKGB3mKsNk7M+WbFoqCQw4Bml/c0XzfV1fR4g2wpH8TNR9MqcD2TIKtc FzCNRyhZYBrZC7cKHjImxeXqJka2Xpw= X-Received: by 10.28.45.193 with SMTP id t184mr4976676wmt.140.1512753715433; Fri, 08 Dec 2017 09:21:55 -0800 (PST) Received: from localhost.localdomain ([160.171.158.223]) by smtp.gmail.com with ESMTPSA id 2sm8838660wre.17.2017.12.08.09.21.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 09:21:54 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 8 Dec 2017 17:21:47 +0000 Message-Id: <20171208172147.21879-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [edk2] [PATCH] Platform/ARM: retire duplicate LCD related PCDs X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" In the rework between v1 and v2 of my ArmPlatformPkg cleanup series, I restored the LCD output graphics drivers in mainline EDK2, but forgot to restore some of the PCDs that now remain in ArmPlatformPkg as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 4 ++-- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 3be4d9d25ff5..5c7137e77115 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -155,8 +155,8 @@ [PcdsFixedAtBuild.common] !ifdef ARM_BIGLITTLE_TC2 ## PL111 Lcd & HdLcd - gArmVExpressTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 - gArmVExpressTokenSpaceGuid.PcdArmHdLcdBase|0x2B000000 + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 + gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x2B000000 gArmVExpressTokenSpaceGuid.PcdHdLcdVideoModeOscId|5 !endif diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index 3dc74ffe9df5..c7710564df5e 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -140,7 +140,7 @@ [PcdsFixedAtBuild.common] !ifdef EDK2_ENABLE_PL111 ## PL111 Versatile Express Motherboard controller - gArmVExpressTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000 !endif ## PL180 MMC/SD card controller diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec index 4c004275d2e2..47cb05a6e265 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec +++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec @@ -47,11 +47,9 @@ [PcdsFixedAtBuild.common] # # For a list of mode numbers look in LcdArmVExpress.c # - gArmVExpressTokenSpaceGuid.PcdPL111LcdBase|0x0|UINT32|0x00000001 gArmVExpressTokenSpaceGuid.PcdPL111LcdMaxMode|3|UINT32|0x00000002 gArmVExpressTokenSpaceGuid.PcdPL111LcdVideoModeOscId|1|UINT32|0x00000003 - gArmVExpressTokenSpaceGuid.PcdArmHdLcdBase|0x0|UINT32|0x00000004 gArmVExpressTokenSpaceGuid.PcdHdLcdVideoModeOscId|0|UINT32|0x00000005 #