From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::241; helo=mail-it0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x241.google.com (mail-it0-x241.google.com [IPv6:2607:f8b0:4001:c0b::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 97D6C2214E329 for ; Mon, 11 Dec 2017 09:54:58 -0800 (PST) Received: by mail-it0-x241.google.com with SMTP id d16so17856554itj.1 for ; Mon, 11 Dec 2017 09:59:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=/vVh8qy8XwaBEar5yyKtqhG9hRGEinwoGjApEkXRHCM=; b=czDcMgR1cgewFvbzEiZ7HWFZv2UdOz2Mch42aSWsnt1+o7QoSt1LrE84i4yw/MbrKj 1xczsDWj0J8ngDpV6z13VrcVpJLeT5Rg2CSbu7PTKYx/a9DnA2wzrt72es2HGb4WPUVY tmR6XxuV3lRDkowQVZqEYLlJxt1sWqxBlvUOw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/vVh8qy8XwaBEar5yyKtqhG9hRGEinwoGjApEkXRHCM=; b=JSSxlkhprZPxuJmibY07oH39lOoYLN6vr+WkfEzpjwiahS0nqCofYTAqe/3GsG1l7A vhKr62kf5Qqttx12/qinYPTZuhCZcxgTCcou72NXXNn1ticwwmKuHH78/ajP1erw6xrj N2BfV6/tKliNiexV0lXve8Duabh16SGc0ItN5iIIjo0kBw3rRXpO1+JQBT6TTSiKbq24 ehcjfG/6tokbTisxr4pRcq5X8EuDgemG2PAH2ZS0jU3xFiAsxzPdnMJpMzOR6aMFbKJw xH6W89tUK3kjh6dLduDrzFPAU4KiO2MNx9Tby1MN3T5s/BsjUxZuY/Ly+IfIQcO30zCj jo8A== X-Gm-Message-State: AKGB3mI6wbllYb/dtM8k9+DfrtkLLJ3IMQ6+/MlXcNuVbHojLFdIr/u6 pcr+NLVS1vMcY5VhUmB1GsgNZ0P2v5+nRakHgbtzTw== X-Google-Smtp-Source: ACJfBoue+lHIhLmAd7yvswrutCjDGRRaowKBbukNsS77m9kJnSqihl5lhXMHw+VH4z0pBAtN5tn/8TwFka0W4Bf08Cg= X-Received: by 10.107.174.222 with SMTP id n91mr1539629ioo.43.1513015175772; Mon, 11 Dec 2017 09:59:35 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Mon, 11 Dec 2017 09:59:35 -0800 (PST) In-Reply-To: <20171211154416.sranbcmhsamp7ezc@bivouac.eciton.net> References: <20171208172147.21879-1-ard.biesheuvel@linaro.org> <20171211154416.sranbcmhsamp7ezc@bivouac.eciton.net> From: Ard Biesheuvel Date: Mon, 11 Dec 2017 17:59:35 +0000 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" Subject: Re: [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: , X-List-Received-Date: Mon, 11 Dec 2017 17:54:58 -0000 Content-Type: text/plain; charset="UTF-8" On 11 December 2017 at 15:44, Leif Lindholm wrote: > On Fri, Dec 08, 2017 at 05:21:47PM +0000, Ard Biesheuvel wrote: >> 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 > > Ah, no, that's what you do here ... sorry, read this one backwards > somehow on previous pass. > Reviewed-by: Leif Lindholm > Thanks. Pushed as ed5e85f14dd00759098426b6426bcf0d64fabf5d >> --- >> 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(-) >> >> 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 >> >> # >> -- >> 2.11.0 >>