On 3 April 2017 at 16:40, Jeremy Linton jeremy.linton@arm.com wrote:

Hi,

On 03/27/2017 03:27 AM, Ard Biesheuvel wrote:

...

Add the modules that are needed to run the console in graphical mode, i.e., when a GFX expansion card with a compatible option ROM is inserted into the system.

Note that this includes the BGRT driver, which creates the BGRT ACPI table on the fly, so update the hardcoded OEM ids as well.

Since the BGRT driver generates ACPI tables on the fly, set the OEM vendor and table IDs to the same value we use in the static tables.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org

---

Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 11 ++++++++++- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 53c7d67bd9b6..47179d2c6186 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -296,7 +296,7 @@ DEFINE DO_KCS = 1

## If TRUE, Graphics Output Protocol will be installed on virtual handle ## created by ConsplitterDxe. It could be set FALSE to save size.

• gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|FALSE

• gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE

So, the GraphcisConsoleDxe has a whole bunch of deprecated UGA support buried in it. Is there a reason for leaving this enabled?

Well, not a good one. I only learned about gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport and how it defaults to TRUE after you asked this question, and I agree we should set it to FALSE in this patch instead.

I will add it in v2. Leif, I take it your R-b extends to cover that as well?

...

[PcdsFixedAtBuild.common] gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000 @@ -443,6 +443,9 @@ DEFINE DO_KCS = 1 ## ACPI (no tables < 4GB) gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20

• gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId|"AMDINC"

gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId|0x20454c5454414553 # SEATTLE

• # # Enable strict image permissions for all images. (This applies # only to images that were built with >= 4 KB section alignment.)

@@ -570,6 +573,9 @@ DEFINE DO_KCS = 1 # # Console IO support #

• MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
• MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

@@ -638,6 +644,7 @@ DEFINE DO_KCS = 1 MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

• MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

!if $(DO_XGBE) # @@ -679,6 +686,7 @@ DEFINE DO_KCS = 1 MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiAml.inf

OpenPlatformPkg/Platforms/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf

MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

# # SMBIOS Support @@ -707,6 +715,7 @@ DEFINE DO_KCS = 1 NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf

NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf }

• MdeModulePkg/Logo/LogoDxe.inf

  # # Crypto Accelerator support (RNG only)

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index c0a12822beb9..d2f01e73fe21 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -113,6 +113,9 @@ READ_LOCK_STATUS = TRUE # # Console IO support #

• INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
• INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
• INF

MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

@@ -174,6 +177,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

• INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

!if $(DO_XGBE) # @@ -212,6 +216,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf INF RuleOverride=ACPITABLE OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiAml.inf INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf

• INF

MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

# # MP-Boot: ACPI[Parking Protocol] + FDT[Spin-Table] @@ -237,6 +242,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf

• INF MdeModulePkg/Logo/LogoDxe.inf

  # # Crypto Accelerator support (RNG only)