Reviewed-by: Andrei Warkentin Looks good to me - there's little reason for using a custom GraphicsConsoleDxe now (historically, the screenshot facility lived there, there's a private interface there for messing with terminal scrolling (unused) and I moved to a different font with my box drawing chars, but the font issue can/needs to be tackled in a different way that Tiano already supports). ________________________________ From: Samer El-Haj-Mahmoud Sent: Tuesday, April 14, 2020 10:43 AM To: devel@edk2.groups.io Cc: Leif Lindholm ; Ard Biesheuvel ; Pete Batard ; Andrei Warkentin Subject: [edk2-platform][PATCH v2 2/3] Platform/RaspberryPi/RPi3: Switch to common GraphicsConsoleDxe Switch from the PI specific GraphicsConsoleDxe driver to the common driver in MdeModulePkg. There is no need to carry RPi specific version. This resolves https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fpftf%2FRPi4%2Fissues%2F32&data=02%7C01%7Cawarkentin%40vmware.com%7Cb8a0cb0f0c7d4aa1f8b908d7e08aa8c2%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637224758455357637&sdata=0TVwjw%2BzBX%2BSEp0YG3Nv2H6%2BlN2faehM9jaNvVrTmoM%3D&reserved=0 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Pete Batard Cc: Andrei Warkentin Signed-off-by: Samer El-Haj-Mahmoud --- Notes: v2: - Set PcdUgaConsumeSupport to FALSE [Ard] Platform/RaspberryPi/RPi3/RPi3.dsc | 3 ++- Platform/RaspberryPi/RPi3/RPi3.fdf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 9ceb0f11c7fe..a451e2a82b59 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -240,6 +240,7 @@ [PcdsFeatureFlag.common] # It could be set FALSE to save size. gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE + gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|FALSE [PcdsFixedAtBuild.common] gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000 @@ -545,7 +546,7 @@ [Components.common] MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf - Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf + MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf MdeModulePkg/Universal/SerialDxe/SerialDxe.inf Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf index 66c2cbada59b..e467b5cd31df 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.fdf +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf @@ -206,7 +206,7 @@ [FV.FvMain] # INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf - INF Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf + INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf INF Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf -- 2.17.1