From patchwork Mon Nov 20 11:37:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 119270 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3733805qgn; Mon, 20 Nov 2017 03:37:29 -0800 (PST) X-Google-Smtp-Source: AGs4zMZuBTvOOKXq0T5ZIpnEUwe/yc/hNjgvla+P564VCQrrwe3S39sAaA2vrBgXbG0TraqSrZMd X-Received: by 10.98.33.8 with SMTP id h8mr10993983pfh.160.1511177849679; Mon, 20 Nov 2017 03:37:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511177849; cv=none; d=google.com; s=arc-20160816; b=c1TfotyyeEElPgVqZ7rRHUN5jB+3BwDVPNg1g2gCsHjQzIfOGdnwS14TEZmh7ichod u38y+bCSmXqBFCTCcshFufjm1FUPTAj+XM+bt/ynkUje4Tql0K5HX/cuQv5FwAGbNlhd CXCuixA2BojNmCPR8Z4Zr2427MLPkN8H8DcrWspcUh1wEsyFhh/c8K7YbVp6De1X/k/T 1Hpg/x1/Olgc44Ckd418HGMwAM1Ns4rzwSAWYwIVqS+tU4ORC4OSlU6dkes8PcjjRPvT DdXfB9O0O/zWgDujTk44llAtws+lXxfuHRbUhMN7M7gNQM/+aoHKcxcJ0MUa2+bcIeyy 4kxA== 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:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=S5tadqRQk/KYtaN1itMJL/p6sVHvGrGOfe9QsloSHFg=; b=Io8jJeBPCqauBTKe0SqiYJZ7DC1xHdoR74rcIGeiaa9mdIsdKd6fsH6N1vdr2MkcQj ekXXv5emPQEko5ZqX8UeKY8x41cFGqGXfTj7hxqJrCesWRmv7L6/rkdmkhbMrkN6yPuV K5VK6qhkdeKInXRREjlaM4USoRSGervjqn+Ta1jQrVTDzTzKwvljfO/tURegra5no9B7 xgFYWmY5dGS7c8d3LBLVOGJaHuBgs35O1KlWjZB4LDxmGXUihzDbhMoioWQQFQnGt//8 +B5p+uY3i6iHJ8rOQgY9nG5IwBIMs2ocVCy7UEa+gymrZhNyEJwRkUxANbeKSWD2tX29 hD1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=A226fWhp; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id h3si7272243plh.254.2017.11.20.03.37.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 03:37:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=A226fWhp; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 2B7FF2034713D; Mon, 20 Nov 2017 03:33:15 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 9B50621959707 for ; Mon, 20 Nov 2017 03:33:13 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id b189so17887305wmd.5 for ; Mon, 20 Nov 2017 03:37:27 -0800 (PST) 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=5/a2caRnb4HFNpDpGnJ1Fvt87zB6ym73i3rTa63+7dk=; b=A226fWhpHJx8FN6toTMuv8f4bM377JH+EatwHKCkG/x0WBcC8rTJH60ccm//wRtPi4 /imOnW/BFGuM/vMXOEgbVYnmSOTajMzttD7nJxoxZxKHRWTufbZ68oOkeoEhQ3Cqat5F WH2epH7GqjqleeisMRFiceJy8d+HbvjwMS1+s= 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=5/a2caRnb4HFNpDpGnJ1Fvt87zB6ym73i3rTa63+7dk=; b=aVAUyeuaNA2Fvjur0VwjC28gYyaB7JBHxNWUuI1RVL+zHQ2LxPMtpQvmo1dm9orBPH LfZ5bTvHKpW6AqmsLZPAkes7onJwfmFTYBF0UDBZIOe/jcJxwLAQd8g23trcVBs2vMyt Mo7HxcagD1HYPvvOc8aJ3o6JcSJnusAf/REfLkv1DEM/P8oCR3SmcHT7mPBmN6ktNRNJ ESXiJXK+bXUWd2aCtRLC8sKMmQcXG1jLQ1PBD+bLAdjBkwBWHvYG2y8/aijeO6P/ZpLO slFQanNEwu0ql0D8IfG0yiG8M3pcWtZ/iK+o1pdRihzFCHcSHgpJUwE1E4W/X48K4fJT EmZA== X-Gm-Message-State: AJaThX6YvgqvXmNKNUg9PV9bnlo5I/CINIqJmY82DN933Mbw3NH5FiZF rGv69Fghm3DRzCrDd7swFXjI36vXTIA= X-Received: by 10.28.22.16 with SMTP id 16mr9137629wmw.138.1511177846101; Mon, 20 Nov 2017 03:37:26 -0800 (PST) Received: from localhost.localdomain ([154.145.25.106]) by smtp.gmail.com with ESMTPSA id d4sm14760181wmh.35.2017.11.20.03.37.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 03:37:25 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 20 Nov 2017 11:37:13 +0000 Message-Id: <20171120113714.21856-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171120113714.21856-1-ard.biesheuvel@linaro.org> References: <20171120113714.21856-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 3/4] Platform/ARM/Juno: move to migrated FdtPlatformDxe 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: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Move Juno to the migrated version of FdtPlatformDxe. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/JunoPkg/ArmJuno.dsc | 6 +++--- Platform/ARM/JunoPkg/ArmJuno.fdf | 2 +- Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 3 ++- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 5 +---- 4 files changed, 7 insertions(+), 9 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index 4c63309d36f1..e7cb280ff381 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -200,7 +200,7 @@ [PcdsDynamicDefault.common] # character "empty" string, to allow to be able to set FDT text device paths # up to 128 characters long. # - gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths|L" " + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L" " # Not all Juno platforms support PCI. This dynamic PCD disables or enable # PCI support. @@ -352,9 +352,9 @@ [Components.common] # # FDT installation # - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf } [Components.AARCH64] diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf index 04d58323d130..898c471248d7 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -230,7 +230,7 @@ [FV.FvMain] # # The UEFI driver is at the end of the list of the driver to be dispatched # after the device drivers (eg: Ethernet) to ensure we have support for them. - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf + INF Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf !if $(ARCH) == AARCH64 # diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index 70175c2d2405..7da336fbd8e7 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -29,6 +29,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Platform/ARM/ARM.dec + Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec Platform/ARM/JunoPkg/ArmJuno.dec [LibraryClasses] @@ -81,7 +82,7 @@ [FixedPcd] gArmTokenSpaceGuid.PcdPciBusMax [Pcd] - gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration [Depex] diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 75f4e924cb9f..3679530decf0 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -457,10 +457,7 @@ [Components.common] # # Android Fastboot # - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { - - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - } + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf