From patchwork Fri Mar 31 14:14:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96436 Delivered-To: patch@linaro.org Received: by 10.182.246.10 with SMTP id xs10csp1250467obc; Fri, 31 Mar 2017 07:15:15 -0700 (PDT) X-Received: by 10.98.252.144 with SMTP id e138mr3086048pfh.266.1490969715330; Fri, 31 Mar 2017 07:15:15 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id f69si5395561pfc.184.2017.03.31.07.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 07:15:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8C4EE20080313; Fri, 31 Mar 2017 07:15:05 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x231.google.com (mail-wr0-x231.google.com [IPv6:2a00:1450:400c:c0c::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5623A20080300 for ; Fri, 31 Mar 2017 07:15:04 -0700 (PDT) Received: by mail-wr0-x231.google.com with SMTP id w11so107046676wrc.3 for ; Fri, 31 Mar 2017 07:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5MivPSOezbjW9Koy++hf7gTLhYguAXbjEAFN/J7o2Aw=; b=BMc/unIKTLi3oOJ3yO16Sh46f5GuGuUk9yF5FvwPb34S/yxo+/2euPGFWKN+62URyk c3fyOtVjc85sDaeR1Bvildl6u+/5Ulb0hBwFqtVhtT7rRAvJ00mViKk7E81Rnztzrplu 03V+hsfBsxs/x9zOMeoAYRBBExIuzuJFJh4ns= 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=5MivPSOezbjW9Koy++hf7gTLhYguAXbjEAFN/J7o2Aw=; b=T3L0rp1/Rp/onVa4tX1WPL9onzDzoPcXLuB7KYVhlD68m3mNBa8bszrOJ043RmpVS/ OJPzfuudrgcHUSmPd9dxL2Iy0PQP4RH6REusVEpCpLOaIlscD8fhCr1hGazGIHRucq+a o8JH0bvcNKFkqT8oDOU2hlihJzA8ARC2NZC7+Udtq0ECQ3fLdgZdmTDoO91Z8GposfmQ dm4XYbMWipEICDBZFjYCZzl5qS7r1WC8OfGy9CMHwRr6C+6gxpgp15c2rBMgTaNVWA6X oGg/X989ZffmXNqhzGao2y295XEXRx72g/XF4atUZ9sDQWzorPagGl07X+/ag2CC7IeS 5hNw== X-Gm-Message-State: AFeK/H0nrbdpMksnJyqldUXhq9hitpQSok0wVzXPHVde4mxBqHcbQL++Svv0weEw2N5BiZF3 X-Received: by 10.223.176.204 with SMTP id j12mr3388699wra.10.1490969702931; Fri, 31 Mar 2017 07:15:02 -0700 (PDT) Received: from localhost.localdomain ([160.171.180.74]) by smtp.gmail.com with ESMTPSA id b42sm6908720wra.36.2017.03.31.07.15.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 07:15:02 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, ryan.harkin@linaro.org Date: Fri, 31 Mar 2017 15:14:34 +0100 Message-Id: <20170331141434.20810-10-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170331141434.20810-1-ard.biesheuvel@linaro.org> References: <20170331141434.20810-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 9/9] ArmPlatformPkg/ArmJunoDxe: remove FDT handling X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Change ArmJunoDxe to be compatible with the new DtPlatformDxe driver, which simply selects one of three embedded DTB binaries based on the current hardware. It also introduces a config screen in the UEFI setup menu that allows either ACPI or DT to be selected (but not both) For this module, it simply means we remove all FDT handling, given that this is now the job of another module. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 26 +------------------- ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 1 - 2 files changed, 1 insertion(+), 26 deletions(-) -- 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c index 2b3cca944cf1..84e820fe07a0 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c @@ -16,7 +16,6 @@ #include #include -#include #include #include @@ -414,9 +413,6 @@ ArmJunoEntryPoint ( { EFI_STATUS Status; EFI_PHYSICAL_ADDRESS HypBase; - CHAR16 *TextDevicePath; - UINTN TextDevicePathSize; - VOID *Buffer; UINT32 JunoRevision; EFI_EVENT EndOfDxeEvent; @@ -530,25 +526,5 @@ ArmJunoEntryPoint ( ); } - // - // Set up the device path to the FDT. - // - TextDevicePath = (CHAR16*)FixedPcdGetPtr (PcdJunoFdtDevicePath); - if (TextDevicePath != NULL) { - TextDevicePathSize = StrSize (TextDevicePath); - Buffer = PcdSetPtr (PcdFdtDevicePaths, &TextDevicePathSize, TextDevicePath); - Status = (Buffer != NULL) ? EFI_SUCCESS : EFI_BUFFER_TOO_SMALL; - } else { - Status = EFI_NOT_FOUND; - } - - if (EFI_ERROR (Status)) { - DEBUG ( - (EFI_D_ERROR, - "ArmJunoDxe: Setting of FDT device path in PcdFdtDevicePaths failed - %r\n", Status) - ); - return Status; - } - - return Status; + return EFI_SUCCESS; } diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index 6719d0adcc87..4330a861cd96 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -82,7 +82,6 @@ [FixedPcd] gArmTokenSpaceGuid.PcdPciBusMax [Pcd] - gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration [Depex]