[PATCH edk2-platforms v2 0/2] Platform/ARM: move to new LCD graphics driver

[PATCH edk2-platforms v2 0/2] Platform/ARM: move to new LCD graphics driver

[Ard Biesheuvel]

This is the edk2-platforms counterpart to the series against EDK2 that
refactors the LCD graphics output driver, and moves platform specific glue
out of the main repository.

v2: very little remains beyond pointing the .dsc files to the new driver,
    and providing a resolution for LcdHwLib

Cc: Girish Pathak <girish.pathak@arm.com>
Cc: Evan Lloyd <evan.lloyd@arm.com>

Ard Biesheuvel (2):
  Platform/ARM: move FVP to the new LcdGraphicsOutputDxe driver
  Platform/ARM: move TC2 to the new LcdGraphicsOutputDxe driver

 Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc    | 4 ++--
 Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf    | 3 +--
 Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 3 ++-
 Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +-
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc         | 5 +----
 5 files changed, 7 insertions(+), 10 deletions(-)

-- 
2.11.0

[PATCH edk2-platforms v2 1/2] Platform/ARM: move FVP to the new LcdGraphicsOutputDxe driver

[Ard Biesheuvel]

Update the FVP .dsc and .fdf files to switch over to the refactored LCD
graphics output driver.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 3 ++-
 Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +-
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc         | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
index c7710564df5e..c4fd9124dfbc 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -46,6 +46,7 @@ [LibraryClasses.common]
 
   ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
 !ifdef EDK2_ENABLE_PL111
+  LcdHwLib|ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.inf
   LcdPlatformLib|Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
 !endif
 
@@ -272,7 +273,7 @@ [Components.common]
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 !ifdef EDK2_ENABLE_PL111
-  ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
+  ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
 !endif
   ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
index 0bac8ae91dab..305e661a2bdc 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -114,7 +114,7 @@ [FV.FvMain]
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
 !ifdef EDK2_ENABLE_PL111
-  INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
+  INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
 !endif
   INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index c6b88c741627..20552ef1a04a 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -82,10 +82,7 @@ [LibraryClasses.common]
   ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
   NorFlashPlatformLib|Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
   ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
-!ifdef EDK2_ENABLE_PL111
-  # ARM PL111 Lcd Driver
-  LcdPlatformLib|Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
-!endif
+
   # ARM PL031 RTC Driver
   RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
-- 
2.11.0

[PATCH edk2-platforms v2 2/2] Platform/ARM: move TC2 to the new LcdGraphicsOutputDxe driver

[Ard Biesheuvel]

Update the TC2 .dsc and .fdf files to switch over to the refactored
LCD graphics output driver.

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-CTA15-A7.fdf | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
index 5c7137e77115..80deaa6fd98d 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -49,6 +49,7 @@ [LibraryClasses.common]
   # ARM General Interrupt Driver in Secure and Non-secure
   ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
 
+  LcdHwLib|ArmPlatformPkg/Library/HdLcd/HdLcd.inf
   LcdPlatformLib|Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
 
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -244,8 +245,7 @@ [Components.common]
 
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
-  #ArmplatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
-  ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/HdLcdGraphicsOutputDxe.inf
+  ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
index 16131bf7895a..5786f117ea7b 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -97,8 +97,7 @@ [FV.FvMain]
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
-  #INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
-  INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/HdLcdGraphicsOutputDxe.inf
+  INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf
   INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
   #
-- 
2.11.0

Re: [PATCH edk2-platforms v2 0/2] Platform/ARM: move to new LCD graphics driver

[Leif Lindholm]

On Fri, Dec 08, 2017 at 05:31:38PM +0000, Ard Biesheuvel wrote:
> This is the edk2-platforms counterpart to the series against EDK2 that
> refactors the LCD graphics output driver, and moves platform specific glue
> out of the main repository.

For the series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> v2: very little remains beyond pointing the .dsc files to the new driver,
>     and providing a resolution for LcdHwLib
> 
> Cc: Girish Pathak <girish.pathak@arm.com>
> Cc: Evan Lloyd <evan.lloyd@arm.com>
> 
> Ard Biesheuvel (2):
>   Platform/ARM: move FVP to the new LcdGraphicsOutputDxe driver
>   Platform/ARM: move TC2 to the new LcdGraphicsOutputDxe driver
> 
>  Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc    | 4 ++--
>  Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf    | 3 +--
>  Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 3 ++-
>  Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +-
>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc         | 5 +----
>  5 files changed, 7 insertions(+), 10 deletions(-)
> 
> -- 
> 2.11.0

Re: [PATCH edk2-platforms v2 0/2] Platform/ARM: move to new LCD graphics driver

[Ard Biesheuvel]

On 12 December 2017 at 17:13, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Fri, Dec 08, 2017 at 05:31:38PM +0000, Ard Biesheuvel wrote:
>> This is the edk2-platforms counterpart to the series against EDK2 that
>> refactors the LCD graphics output driver, and moves platform specific glue
>> out of the main repository.
>
> For the series:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>

Thanks. Pushed as ed5e85f14dd0..2b3b95cb9fc9


>
>> v2: very little remains beyond pointing the .dsc files to the new driver,
>>     and providing a resolution for LcdHwLib
>>
>> Cc: Girish Pathak <girish.pathak@arm.com>
>> Cc: Evan Lloyd <evan.lloyd@arm.com>
>>
>> Ard Biesheuvel (2):
>>   Platform/ARM: move FVP to the new LcdGraphicsOutputDxe driver
>>   Platform/ARM: move TC2 to the new LcdGraphicsOutputDxe driver
>>
>>  Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc    | 4 ++--
>>  Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf    | 3 +--
>>  Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 3 ++-
>>  Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +-
>>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc         | 5 +----
>>  5 files changed, 7 insertions(+), 10 deletions(-)
>>
>> --
>> 2.11.0