diff mbox series

[edk2] Platform/ARM: retire duplicate LCD related PCDs

Message ID 20171208172147.21879-1-ard.biesheuvel@linaro.org
State New
Headers show
Series [edk2] Platform/ARM: retire duplicate LCD related PCDs | expand

Commit Message

Ard Biesheuvel Dec. 8, 2017, 5:21 p.m. UTC 
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(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Leif Lindholm Dec. 11, 2017, 3:44 p.m. UTC | #1 
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

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Dec. 11, 2017, 5:59 p.m. UTC | #2 
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

>>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox series

Patch

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
 
   #