From patchwork Mon Apr 3 16:09:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96657 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp168848qgd; Mon, 3 Apr 2017 09:10:14 -0700 (PDT) X-Received: by 10.55.174.198 with SMTP id x189mr17536267qke.318.1491235814176; Mon, 03 Apr 2017 09:10:14 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t188si12263457qkh.308.2017.04.03.09.10.13; Mon, 03 Apr 2017 09:10:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D4E6E63DF6; Mon, 3 Apr 2017 16:10:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7DD1E62D6B; Mon, 3 Apr 2017 16:10:10 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5086662D6B; Mon, 3 Apr 2017 16:10:08 +0000 (UTC) Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by lists.linaro.org (Postfix) with ESMTPS id 4CF5E60D75 for ; Mon, 3 Apr 2017 16:10:07 +0000 (UTC) Received: by mail-wr0-f174.google.com with SMTP id k6so170765355wre.2 for ; Mon, 03 Apr 2017 09:10:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7AUVLFjyN6dTWFiT1VMHCzQoHIElRECA/n7c+27n4SE=; b=uVcES+CjqE9P6qcfMqeNaQljZDkqfHqAB+LKJNFVRdZt9Gep2tXGKDD1dMS0eUStKI tPdVREXtpBK/Ct7W+jq2dJN++z3BWyrYhcIe94jpmswSFlAn5PkZForsN08JB4OXHta9 z31n5Fjo7rUJJCoM2ZAwgmHuMpFyHaadWAdwYlFtTRm1qoJS+3YnQIyJhMvuvqeUsWF3 GOqP3LzV6guDc6//bePpskWqLqS6qHKKg937tP8NpQdk9HKGd0UCC1QtV19K7tkchxt4 kvm7ftg6nCeIdnuyIvA/zc8e81dx+yD9VgDOFmomPq+Q7wLEF9bA00HGWaEvfgdC/0Pi r3Jg== X-Gm-Message-State: AFeK/H2Ed485kbKjcOJKKwTgq8HO1V7/Ncw8THM6KyXv8DI8Ejlpuus+ 5jvLBxaDtceR5Ze0gRg= X-Received: by 10.28.32.194 with SMTP id g185mr4847753wmg.6.1491235806318; Mon, 03 Apr 2017 09:10:06 -0700 (PDT) Received: from localhost.localdomain ([160.163.145.113]) by smtp.gmail.com with ESMTPSA id e129sm14931600wma.13.2017.04.03.09.09.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 09:10:05 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Mon, 3 Apr 2017 17:09:45 +0100 Message-Id: <20170403160945.18701-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 Subject: [Linaro-uefi] [PATCH v2] Platforms/AMD/OverdriveBoard: add graphical console support X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" 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 --- v2: disable obsolete UGA support in ConSplitterDxe and GraphicsConsoleDxe Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 13 ++++++++++++- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 6 ++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index caae1a9a3af1..a35953d2ec9a 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -295,7 +295,9 @@ 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 + gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE + gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|FALSE [PcdsFixedAtBuild.common] gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000 @@ -442,6 +444,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.) @@ -569,6 +574,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 @@ -637,6 +645,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) # @@ -678,6 +687,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 @@ -706,6 +716,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)