From patchwork Thu Apr 6 10:29:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96925 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp664683qgd; Thu, 6 Apr 2017 03:33:11 -0700 (PDT) X-Received: by 10.55.46.198 with SMTP id u189mr31240581qkh.88.1491474791783; Thu, 06 Apr 2017 03:33:11 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f1si1037895qtb.29.2017.04.06.03.33.11; Thu, 06 Apr 2017 03:33:11 -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 7D18864342; Thu, 6 Apr 2017 10:33:11 +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 F0EE564353; Thu, 6 Apr 2017 10:30:23 +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 6604D6433A; Thu, 6 Apr 2017 10:30:10 +0000 (UTC) Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by lists.linaro.org (Postfix) with ESMTPS id 35AAD64334 for ; Thu, 6 Apr 2017 10:30:07 +0000 (UTC) Received: by mail-wr0-f170.google.com with SMTP id w11so51198727wrc.3 for ; Thu, 06 Apr 2017 03:30: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:in-reply-to :references; bh=XWzfWctUrez4wVsDSQ5YkPfpjyz69ucI8NpnfB+uDk8=; b=uPOOsFoSCn+0O5SjLM5Rwf4eFDOscrGcGA28k1dKcpqD55NfIvOpeSQjQZx5eloq7S 3pLmldC+Ko+uTHT0h+3fwfxwt5mQgrkP5SO+D6Zy9k6I/teu1SUW46nRKRuJJKPgBCMD tel1g76JEQI17azMZo0bOkoFYGiDCruowATC09dCt73eHqQZM8QFld5Ir8lA4TskHAvn 6rFgYcCqyw9Zdm/RrVYpj5Vv+t0DjZbn62K6Xokmpt1EDX1kdWJa5jfqyfwuS3dZsGp3 3U/7nOPaAOzya5+qaBVjpFnFPyNvZyh6x/snlDowFac7ueLfL3iw4EgfTQB1w8qD0wkM fA1g== X-Gm-Message-State: AFeK/H3TyFPZl7B2W2bS36U9pXO+feI5346xnjK7x+AuZizRXaeV4lWGj9Q2Zbco6Z8qOGM7KNA= X-Received: by 10.223.134.152 with SMTP id 24mr21166434wrx.30.1491474605629; Thu, 06 Apr 2017 03:30:05 -0700 (PDT) Received: from localhost.localdomain ([160.163.145.113]) by smtp.gmail.com with ESMTPSA id s27sm1562822wra.69.2017.04.06.03.30.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Apr 2017 03:30:04 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Thu, 6 Apr 2017 11:29:39 +0100 Message-Id: <20170406102941.14802-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170406102941.14802-1-ard.biesheuvel@linaro.org> References: <20170406102941.14802-1-ard.biesheuvel@linaro.org> Cc: alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 6/8] Platforms/AMD: switch Overdrive to DtPlatformDxe 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" Replace FdtDxe with the generic DtPlatformDxe, which forces mutual exclusion between DT and ACPI, and does not depend on the deprecated ARM BdsLib. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 11 +++++++---- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index a35953d2ec9a..65d229884aa7 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -606,11 +606,10 @@ DEFINE DO_KCS = 1 # # FDT support # - OpenPlatformPkg/Platforms/AMD/Styx/Drivers/FdtDxe/FdtDxe.inf { + EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf { - # deprecated BdsLib from the ARM BDS - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf + DtPlatformDtbLoaderLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf } # @@ -684,7 +683,11 @@ DEFINE DO_KCS = 1 # # 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 MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index d2f01e73fe21..d51bed87ebf6 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -144,9 +144,9 @@ READ_LOCK_STATUS = TRUE # # FDT support # - INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/FdtDxe/FdtDxe.inf + INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf - FILE FREEFORM = PCD(gAmdStyxTokenSpaceGuid.PcdStyxFdt) { + FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 { SECTION RAW = OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/FdtBlob/styx-overdrive.dtb }