From patchwork Thu Apr 6 10:29:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96926 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp664741qgd; Thu, 6 Apr 2017 03:33:23 -0700 (PDT) X-Received: by 10.55.42.28 with SMTP id q28mr25378600qkh.131.1491474803869; Thu, 06 Apr 2017 03:33:23 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m5si1027559qkm.116.2017.04.06.03.33.23; Thu, 06 Apr 2017 03:33:23 -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 8E01564342; Thu, 6 Apr 2017 10:33:23 +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 2EDCB64356; Thu, 6 Apr 2017 10:30:26 +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 7D1ED64337; Thu, 6 Apr 2017 10:30:11 +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 0D43464336 for ; Thu, 6 Apr 2017 10:30:08 +0000 (UTC) Received: by mail-wr0-f170.google.com with SMTP id o21so26830652wrb.2 for ; Thu, 06 Apr 2017 03:30:08 -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=xmX66mXFk9Oe2AZO3xefYdKW93On3rKL6qoq10eLlGo=; b=tIQOJe0lC6XXpRJLq5/FAAcDJshijSh0yRuBoQLCm69eawFGJBE+xEhmlPfKCqvBha eP4/V2+pBfJG55PqGYqvJhtwGbF1DdRXnodUz9hu4aDKwpYL6JSDjWePJYRxQNKyaLIK 6WJ7Qi2GpN0gQvs9umKTsOnnuH8kcmdu63wJuMDBs+lwhqvcTCVvmM67pwOHzVA99lng XB75jaOHQ5qWeN5TZyyo0pr3Jiuia0iDmZ2Yi/qbCdfBhz1LwwtKIIo7w5WnlmW0fjR/ MnyV5XrYK9wIKltoamW2dLTYd+1Vv/cYoLnzxpC74KYSKyNRX24NdoMOFSPkU6Yvw53h KEaA== X-Gm-Message-State: AFeK/H0teMhIRcpS5JWTVthMpw6i8dqhaf2kXM2fIA8q5Jt7KfMoSXsVrqfnyQwq/u5FIjmUmdo= X-Received: by 10.28.23.198 with SMTP id 189mr22294197wmx.127.1491474607764; Thu, 06 Apr 2017 03:30:07 -0700 (PDT) Received: from localhost.localdomain ([160.163.145.113]) by smtp.gmail.com with ESMTPSA id s27sm1562822wra.69.2017.04.06.03.30.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Apr 2017 03:30:06 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Thu, 6 Apr 2017 11:29:40 +0100 Message-Id: <20170406102941.14802-8-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 7/8] Platforms/AMD: switch Overdrive 1000 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/Overdrive1000Board/Overdrive1000Board.dsc | 10 ++++++---- Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc index f723452ad2f2..b1a7cfd4c4a8 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc @@ -563,11 +563,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 } # @@ -637,7 +636,10 @@ 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 diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf index 170d80be84fa..c7f98b087fa9 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf @@ -141,9 +141,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/Overdrive1000Board/FdtBlob/styx-overdrive1000.dtb }