From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Leif Lindholm <leif.lindholm@linaro.org>
Cc: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH] Platform/ARM: retire duplicate LCD related PCDs
Date: Mon, 11 Dec 2017 17:59:35 +0000 [thread overview]
Message-ID: <CAKv+Gu9_1o6QX3gcNHzrErZFFtHaD6dzEVV1M-jc0Mn9UxbsaQ@mail.gmail.com> (raw)
In-Reply-To: <20171211154416.sranbcmhsamp7ezc@bivouac.eciton.net>
On 11 December 2017 at 15:44, Leif Lindholm <leif.lindholm@linaro.org> 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 <ard.biesheuvel@linaro.org>
>
> Ah, no, that's what you do here ... sorry, read this one backwards
> somehow on previous pass.
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
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
>>
prev parent reply other threads:[~2017-12-11 17:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-08 17:21 [PATCH] Platform/ARM: retire duplicate LCD related PCDs Ard Biesheuvel
2017-12-11 15:44 ` Leif Lindholm
2017-12-11 17:59 ` Ard Biesheuvel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKv+Gu9_1o6QX3gcNHzrErZFFtHaD6dzEVV1M-jc0Mn9UxbsaQ@mail.gmail.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox