* [PATCH] Platform/ARM: retire duplicate LCD related PCDs
@ 2017-12-08 17:21 Ard Biesheuvel
2017-12-11 15:44 ` Leif Lindholm
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel @ 2017-12-08 17:21 UTC (permalink / raw)
To: edk2-devel; +Cc: leif.lindholm, Ard Biesheuvel
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Platform/ARM: retire duplicate LCD related PCDs
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
0 siblings, 1 reply; 3+ messages in thread
From: Leif Lindholm @ 2017-12-11 15:44 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel
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>
> ---
> 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Platform/ARM: retire duplicate LCD related PCDs
2017-12-11 15:44 ` Leif Lindholm
@ 2017-12-11 17:59 ` Ard Biesheuvel
0 siblings, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2017-12-11 17:59 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
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
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-11 17:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox