From patchwork Fri Jun 23 18:30:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106282 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp346126qgd; Fri, 23 Jun 2017 11:32:05 -0700 (PDT) X-Received: by 10.55.105.133 with SMTP id e127mr10877731qkc.19.1498242724929; Fri, 23 Jun 2017 11:32:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498242724; cv=none; d=google.com; s=arc-20160816; b=n6yk/K4lcqyqYfkSXGb4oAbNSLTg3nO/64bW8jAeMLD2LUcKXlvZX9SsVmDnSGtmVy mXMFY3ufy7rhXniK9wm/JutbSrzaiv8aMAongPry5IkHmQ67yjD9wha6yOzKGV8WbqLj wAnKHrakSQhdhlICtL/VLcj6t5K6W/QqhzlnZ7aY3IDQl/0clrSQzh16CkalQdhQsUzn 1FNdN3ghNH2Q0U17Z31JYUJy3yxJF050Di0T/XMcw4kobg2gtmMaUyv7o2Xoi8AuKasr OYWJ8XfUDSgDHZvnrMa49noqVVh01JugFsNnw67LWRQwf60TrQi5fSnDQ7LjJL0dJdX0 cmVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=sW0b5DU72mMpj+8Etpprt/DSU/OcXLpyxAwRX2Dx28I=; b=uYVpE5d/frYcBnFuop7CMasKuo0sgnnnfTrAkANFqbCXMEZKXALmMZshzkHB08axsR 8sOCjJpYPmAWsXTjbcpGSTCPwmhA19QNcrWb08ezdzBEeuFakwMeUYu14j4YdTYri6qC L4DN56a1whwcb+jngT9OAqyHWwIWS+nDhBBgzzDM27T0Un1M6Lu42sVS7nRM/Al07nhI mGVryTsEs493JaALuB2t/bQpcp1G/d6FUam952fBr251l6Ajr6Xqk4yI6fUHacyXev0P xfFRrcTz4uHThArBobmV3x8YL2P6nx4p28srU9t80LzuS7KwG5xdiHEH+J8wrsImAoM7 t06Q== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j29si347158qta.153.2017.06.23.11.32.04; Fri, 23 Jun 2017 11:32:04 -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 83EC960C39; Fri, 23 Jun 2017 18:32:04 +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=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 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 649F760C48; Fri, 23 Jun 2017 18:31:24 +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 31A7760C2F; Fri, 23 Jun 2017 18:31:16 +0000 (UTC) Received: from mail-wr0-f173.google.com (mail-wr0-f173.google.com [209.85.128.173]) by lists.linaro.org (Postfix) with ESMTPS id 6AF0860C34 for ; Fri, 23 Jun 2017 18:31:04 +0000 (UTC) Received: by mail-wr0-f173.google.com with SMTP id k67so76172235wrc.2 for ; Fri, 23 Jun 2017 11:31:04 -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:in-reply-to :references; bh=s0RsK2TREGDY3WxGMr3swwFy0jIxyMXjr7I1GRz6QnA=; b=QFWbQo7MaN3nV6qdTyyv/yqr34e/vRcrwJ4mUCDZtnWbhTDGiqtO3EeVlmgVshKpwQ z56MFZZez0KyzdVnsT2xePBo2e97YisM7EC/gpfDoeVUbpteROZDx3Sd+pfAahVEtS8m AWMrlxQTqtdc4oocbVyb+mrhWvVFJ9zLcZAkwWR3yv+ig1EyOaeyB4kwTxSy7mY0BkDl MQs7UUmQ6GeCkeCIP99pGgGroHt0ZevwTr3aAxWzQFD5les9kuab8M+FXtOgepVUyUI4 D5cAOcpTV9sCQvJrHa/WiltYYds+FD7SHCb2KPGgroLkB5006d82rol7f1UpolAi2iAK ll4A== X-Gm-Message-State: AKS2vOzuaz5L6Y25Hb4CIkXmaY1QjQ61MeF11/vBfT+g3BwVAcUBTqGX /AV3Ql5PZUmKpCC8V7c5UwXI X-Received: by 10.28.64.67 with SMTP id n64mr6396705wma.93.1498242663251; Fri, 23 Jun 2017 11:31:03 -0700 (PDT) Received: from localhost.localdomain ([160.171.41.197]) by smtp.gmail.com with ESMTPSA id l190sm5632336wmb.18.2017.06.23.11.31.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 11:31:02 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 23 Jun 2017 18:30:43 +0000 Message-Id: <20170623183045.21494-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170623183045.21494-1-ard.biesheuvel@linaro.org> References: <20170623183045.21494-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com, alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 4/6] Platforms/AMD/Cello: add device tree support X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." 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" Now that we have the ability to switch between ACPI and DT support in the UEFI setup menu, let's add DT support to Cello as well. The change is trivial, and it improves the utility of this board for development. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 19 +++++++++++++++++-- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 9 +++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index d10c0901c811..2b041192c887 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -470,9 +470,11 @@ DEFINE DO_KCS = 0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0 -[PcdsDynamicExHii.common.DEFAULT] +[PcdsDynamicHii] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 + gAmdStyxTokenSpaceGuid.PcdEnableSmmus|L"StyxEnableSmmus"|gAmdStyxVariableGuid|0x0|FALSE + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -556,6 +558,15 @@ DEFINE DO_KCS = 0 AmdModulePkg/Iscp/IscpDxe.inf # + # FDT support + # + EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf { + + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf + DtPlatformDtbLoaderLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf + } + + # # PCI support # AmdModulePkg/Gionb/Gionb.inf @@ -608,7 +619,11 @@ DEFINE DO_KCS = 0 # # ACPI Support # - MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf + MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf { + + NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf + } + OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiAml.inf OpenPlatformPkg/Platforms/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 29103531a224..6f7428f0c4ca 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -139,6 +139,15 @@ READ_LOCK_STATUS = TRUE INF AmdModulePkg/Iscp/IscpDxe.inf # + # FDT support + # + INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf + + FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 { + SECTION RAW = OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/FdtBlob/styx-overdrive.dtb + } + + # # PCI support # INF AmdModulePkg/Gionb/Gionb.inf