From patchwork Wed Mar 22 14:04:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 95742 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230254obz; Wed, 22 Mar 2017 07:04:25 -0700 (PDT) X-Received: by 10.98.2.21 with SMTP id 21mr46806049pfc.93.1490191465569; Wed, 22 Mar 2017 07:04:25 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id j185si1932064pge.320.2017.03.22.07.04.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 07:04:25 -0700 (PDT) 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; 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 A80B980423; Wed, 22 Mar 2017 07:04:23 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x22e.google.com (mail-wr0-x22e.google.com [IPv6:2a00:1450:400c:c0c::22e]) (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 10D4880423 for ; Wed, 22 Mar 2017 07:04:22 -0700 (PDT) Received: by mail-wr0-x22e.google.com with SMTP id l37so130396536wrc.1 for ; Wed, 22 Mar 2017 07:04:22 -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=WC7cFSCtOtoaWqPSma6xgoOnRQ3RQb5v7zP6JSUvt6s=; b=e2OjCz8W90ZuPj7E3E7wJX1pWzIS1WEm1dhxdCV97BZ3K0IPly4PIAUdCYy1j0m+jV YPPP4t174qIVSy9wYCgUK18iCUyPtS2YgJpemS6cEauu3kZ0ARPxlShGJfSci7Ogx8e9 LXkQtcudtYPgP78VKAYpw3XHr+GurTfIf+Eis= 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=WC7cFSCtOtoaWqPSma6xgoOnRQ3RQb5v7zP6JSUvt6s=; b=Ik3zmAVB6kbUwpGfimFqQYUtlwtR2d832qeMQnVLpUvicolnCFKiXeD64Nvwwz0YTW YR43oAieQ+cIhnsWE9wJERV1pI/QJSqxg5Yt6XxGpkwMjI8Cw/r2JAwxplwL5S9JYP24 6PUA0s5dYtPcU9uiUt8WPTXKVut9MhZb2NnJtiSjq6TpGca6CcNSKrhq7gq46etkroC9 XVF6DTUi+q+dDQclSVQ2ksTKRoQZcFIr2V5cW0VjunAlE0AuODfQMzfKLRjbaosauIii zds40mOJBiDjYujJlAxNFzA5rrh9cxFsSUCPA635Aa/KTdzyg9Bg4nRC9VjyTme+ZzMB PsUA== X-Gm-Message-State: AFeK/H1mg++05dd+QWH/lgy5OuFrP1cnZHeG+y10+b58TosleOwHVo4Vqd76u/lgzdiSt/Zs X-Received: by 10.223.171.23 with SMTP id q23mr35125768wrc.163.1490191460711; Wed, 22 Mar 2017 07:04:20 -0700 (PDT) Received: from localhost.localdomain ([160.172.77.216]) by smtp.gmail.com with ESMTPSA id 134sm507113wmj.6.2017.03.22.07.04.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 07:04:19 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com, jaben.carsey@intel.com, ruiyu.ni@intel.com, michael.d.kinney@intel.com, kelly.steele@intel.com Date: Wed, 22 Mar 2017 14:04:05 +0000 Message-Id: <1490191448-22398-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> References: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 1/4] ShellPkg: add GUID declaration for FILE_GUID of UEFI Shell app to package 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" In QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c, there is a definition of mUefiShellFileGuid which is a constant reference to the FILE_GUID as defined in ShellPkg/Application/Shell/Shell.inf. To prevent the need for duplicating it to other modules, promote it to a proper global GUID, and add it to the ShellPkg.dec package declaration. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ShellPkg/ShellPkg.dec | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Jaben Carsey diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec index bb31c2df8cb3..3ad17a44b447 100644 --- a/ShellPkg/ShellPkg.dec +++ b/ShellPkg/ShellPkg.dec @@ -57,6 +57,9 @@ [Guids] gShellTftpHiiGuid = {0x738a9314, 0x82c1, 0x4592, {0x8f, 0xf7, 0xc1, 0xbd, 0xf1, 0xb2, 0x0e, 0xd4}} gShellBcfgHiiGuid = {0x5f5f605d, 0x1583, 0x4a2d, {0xa6, 0xb2, 0xeb, 0x12, 0xda, 0xb4, 0xa2, 0xb6}} + # FILE_GUID as defined in ShellPkg/Application/Shell/Shell.inf + gUefiShellFileGuid = {0x7c04a583, 0x9e3e, 0x4f1c, {0xad, 0x65, 0xe0, 0x52, 0x68, 0xd0, 0xb4, 0xd1}} + [Protocols] gEfiShellEnvironment2Guid = {0x47c7b221, 0xc42a, 0x11d2, {0x8e, 0x57, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}} gEfiShellInterfaceGuid = {0x47c7b223, 0xc42a, 0x11d2, {0x8e, 0x57, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}} From patchwork Wed Mar 22 14:04:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 95743 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230276obz; Wed, 22 Mar 2017 07:04:28 -0700 (PDT) X-Received: by 10.98.207.68 with SMTP id b65mr46347561pfg.12.1490191468346; Wed, 22 Mar 2017 07:04:28 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id a77si1380752pfa.221.2017.03.22.07.04.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 07:04:28 -0700 (PDT) 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; 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 DB11280426; Wed, 22 Mar 2017 07:04:26 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x234.google.com (mail-wr0-x234.google.com [IPv6:2a00:1450:400c:c0c::234]) (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 EEA008038D for ; Wed, 22 Mar 2017 07:04:25 -0700 (PDT) Received: by mail-wr0-x234.google.com with SMTP id l37so130397527wrc.1 for ; Wed, 22 Mar 2017 07:04:25 -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=yGD8ir/ka7IffQmquBHRxVhzrFNbWCMGUUeXPkny4RQ=; b=NEOxsHVpla0JIGwtDYmA8cLajhTZdI8QSfMEw7ekOhQ9Xi9W6He8WSXiZFDlSgNMAq GDviFtX/bTUmuOst8LwGPe1zSj0RQKnfWKZvJnPOKSuKfRBbYtBYJoaiVbc0k9akXKbb dO2FOssJSF1CAfZ8fTL4MN/VUXqZm0pdD2OBQ= 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=yGD8ir/ka7IffQmquBHRxVhzrFNbWCMGUUeXPkny4RQ=; b=FepJ694vpeK0p8ML6adZUYz0TChz5GlQXvbKBC//ZanDiXG/bYH0KrcOmvXKtcGrYY bHOxfnOOyzQUvC6lCzFdKsYJZ4WmW71FeYWxJWioAN8D/XV9HZejRF/NsdsTHwwm0Za2 iyDqfWYDcw/FcAgZFNIt6+aijTk3T3HWJ2QjnVcXqwPU/1ZPN7VfT9E5pEjfoAJBjqIY 5A3U1LF/H+GaZYEHbgwo3rOxzhjj+BejVs1EIqnRwilI7ECZs+DwRQBGDZrm19XgFPEz QvBKXhEE6aoOBiXIJZ5aun6scb/ZmvC7ewMnvshEZ8GxhHpOiBKi4fT7QHCUA3rXqWlr L/DA== X-Gm-Message-State: AFeK/H0O5DVvcfGHnJdwSfadbpNjuzIlg46J+DZ9wwIhJ9bdKBCIITl8TD+m+8y0Et1t56Zo X-Received: by 10.223.135.252 with SMTP id c57mr3245321wrc.109.1490191464578; Wed, 22 Mar 2017 07:04:24 -0700 (PDT) Received: from localhost.localdomain ([160.172.77.216]) by smtp.gmail.com with ESMTPSA id 134sm507113wmj.6.2017.03.22.07.04.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 07:04:23 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com, jaben.carsey@intel.com, ruiyu.ni@intel.com, michael.d.kinney@intel.com, kelly.steele@intel.com Date: Wed, 22 Mar 2017 14:04:06 +0000 Message-Id: <1490191448-22398-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> References: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 2/4] QuarkPlatformPkg/PlatformBootManagerLib: use new UefiShellFileGuid definition 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" Move to the new definition of UefiShellFileGuid, which is defined in the ShellPkg package declaration file rather than hardcoded in this module. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c | 4 +--- QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Michael Kinney diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index b61eb03360a2..3c213180690d 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "PlatformBootManager.h" -EFI_GUID mUefiShellFileGuid = {0x7C04A583, 0x9E3E, 0x4f1c, {0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }}; - /** Return the index of the load option in the load option array. @@ -246,7 +244,7 @@ PlatformBootManagerBeforeConsole ( // // Register UEFI Shell // - PlatformRegisterFvBootOption (&mUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE); + PlatformRegisterFvBootOption (&gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE); Status = gBS->LocateProtocol(&gEsrtManagementProtocolGuid, NULL, (VOID **)&EsrtManagement); if (EFI_ERROR(Status)) { diff --git a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index af399e529a92..25394d8ca000 100644 --- a/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -40,6 +40,7 @@ [Packages] SourceLevelDebugPkg/SourceLevelDebugPkg.dec QuarkPlatformPkg/QuarkPlatformPkg.dec SecurityPkg/SecurityPkg.dec + ShellPkg/ShellPkg.dec SignedCapsulePkg/SignedCapsulePkg.dec [LibraryClasses] @@ -70,6 +71,7 @@ [Guids] gEfiVTUTF8Guid gEfiTtyTermGuid gEfiEndOfDxeEventGroupGuid + gUefiShellFileGuid [Pcd] gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate From patchwork Wed Mar 22 14:04:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 95745 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230314obz; Wed, 22 Mar 2017 07:04:31 -0700 (PDT) X-Received: by 10.98.89.139 with SMTP id k11mr45308036pfj.196.1490191471503; Wed, 22 Mar 2017 07:04:31 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id o8si615312pgn.150.2017.03.22.07.04.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 07:04:31 -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 1BCF5803D2; Wed, 22 Mar 2017 07:04:30 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) (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 52BB68042A for ; Wed, 22 Mar 2017 07:04:28 -0700 (PDT) Received: by mail-wm0-x22e.google.com with SMTP id u132so37746435wmg.0 for ; Wed, 22 Mar 2017 07:04:28 -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=ZHYHcIkh1j3qFX4zVjUXVddVpSO7eOJtsR/VcYAT5qY=; b=CqHTKsyqBpF6APN5lmN0NWHDJkAIv4dvWh0jWdzlA25NhNSMvdyuIvVd2ypN7aSaH3 ql+cq/fvQ+slnnlPvuDG6XRi/+JBSC5Irk5wCOTyaiDgzGooEAes57dtP8eR0ZLNTJIE N8Au15/pyqO/bHJAblyHM8b0jDBdtCrttBWgI= 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=ZHYHcIkh1j3qFX4zVjUXVddVpSO7eOJtsR/VcYAT5qY=; b=S1hRQSAkPmTgGisrT0i5QCSi5800diBYCAIg3sjxlqnqRfwL47Nf9vcoihB6qfokg/ akFYGNU7GTLbElRVSNSL7XV9YTjqiWRoq7YypsjuVlDBGDRZjed1Y8Ynytycb+hBVcRz N1gR/fIdC2/l48h/c21awOpdX74AcXG1K/pFWFl1RaJtBEZjvUbOFuRAdIVi3yP8iCxQ UKjSA9T8WEZkTaaf/PAfCTNihj/3krtsZ+WOlVFGao4a0KmSOK7sNpB49pa/WHmh682v UfeNI1eAAksmTuTIErSGABb4vLiGCHoWfYWihShsdirsz8iyqfS7r7SvAx13qCkgvl7z XnrA== X-Gm-Message-State: AFeK/H1ml0Ie+QcSNdKR9O5p6o+adby1ZaYsV75jmmMrGxkNLWvo7r1aK+7bHUOozCFwmeAu X-Received: by 10.28.147.147 with SMTP id v141mr8727770wmd.110.1490191466867; Wed, 22 Mar 2017 07:04:26 -0700 (PDT) Received: from localhost.localdomain ([160.172.77.216]) by smtp.gmail.com with ESMTPSA id 134sm507113wmj.6.2017.03.22.07.04.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 07:04:26 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com, jaben.carsey@intel.com, ruiyu.ni@intel.com, michael.d.kinney@intel.com, kelly.steele@intel.com Date: Wed, 22 Mar 2017 14:04:07 +0000 Message-Id: <1490191448-22398-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> References: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 3/4] ArmPkg/PlatformBootManagerLib: refer to Shell FILE_GUID directly 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" Instead of indirecting the reference to the Shell binary via a PCD that is defined in IntelFrameworkModulePkg, and which invariably gets set to the same value by all users of this library, refer to the UEFI Shell application by its declared symbolic GUID. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 5 ++--- ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index cc5a4d1ff9b3..3eaed3a4799b 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -33,7 +33,6 @@ #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) } - #pragma pack (1) typedef struct { VENDOR_DEVICE_PATH SerialDxe; @@ -327,7 +326,7 @@ AddOutput ( STATIC VOID PlatformRegisterFvBootOption ( - EFI_GUID *FileGuid, + CONST EFI_GUID *FileGuid, CHAR16 *Description, UINT32 Attributes ) @@ -540,7 +539,7 @@ PlatformBootManagerAfterConsole ( // Register UEFI Shell // PlatformRegisterFvBootOption ( - PcdGetPtr (PcdShellFile), L"UEFI Shell", LOAD_OPTION_ACTIVE + &gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE ); } diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 8ec4f1dea6c4..beca5800d649 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -39,6 +39,7 @@ [Packages] IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec + ShellPkg/ShellPkg.dec [LibraryClasses] BaseLib @@ -59,7 +60,6 @@ [FeaturePcd] [FixedPcd] gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity @@ -75,6 +75,7 @@ [Guids] gEfiFileSystemVolumeLabelInfoIdGuid gEfiEndOfDxeEventGroupGuid gEfiTtyTermGuid + gUefiShellFileGuid [Protocols] gEfiDevicePathProtocolGuid From patchwork Wed Mar 22 14:04:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 95746 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230342obz; Wed, 22 Mar 2017 07:04:35 -0700 (PDT) X-Received: by 10.99.39.71 with SMTP id n68mr42844918pgn.85.1490191475071; Wed, 22 Mar 2017 07:04:35 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id y18si1924739pgf.390.2017.03.22.07.04.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 07:04:35 -0700 (PDT) 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; 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 4786D80425; Wed, 22 Mar 2017 07:04:34 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::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 233848038D for ; Wed, 22 Mar 2017 07:04:32 -0700 (PDT) Received: by mail-wm0-x231.google.com with SMTP id n11so37631003wma.1 for ; Wed, 22 Mar 2017 07:04:32 -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=yTqvj/JD3yfdUS/FMuwG98r42XnH13eaFZFkrAnxZkU=; b=czYG1JJHLyy7rDvQY0y9iFZYgpl7IDb+tgEq53iPUfRW5rANu5K6r27MTsOx4Bz2Hj jfBG5hS96n+6O4x7ykFhOlVOnFBFdU4Za3X0z09rzO3Ezg33reGF5qVkwpDTQt30JI7t jn4SrRgvHg7IIWFmsZDaG7dX2tF3UtDttAZUA= 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=yTqvj/JD3yfdUS/FMuwG98r42XnH13eaFZFkrAnxZkU=; b=ff2ZXWE0XORksKVaK7IuGtXPuc5IqiH2xNS2bJl1v7J4PqEQJIi2Zu+IU4SFQKxOHR x2FCzBQXPp1+n68l3lRD8aEc5c2/14MnLVnv6R9EdwnxZnajGnyTSKpmP7JYLRXmU61U ix7BFdg8QaJBvSUfoN2Aw4ulicvySKDzNbOHNjmqDo1ovIeRDvlAWjl2GvXS8UNPtAsT 5oG6MCAdmAxNK7Sk3kE9jL+ZG3FUbLSuD5bfTMGbQumI/jhaae43W10WdDZWxKB1OITU BL+weR/O/M8ybZRkRu1ntle5aNZOduOBM/EkElxnOHcbrxidGo6NjL5uLq+i0hE5OK/0 CqbA== X-Gm-Message-State: AFeK/H3yqbDtgP8IqDtgvIqsSBK0Fg8mInnYathhctz/y2O8CdR2mfWlzWXIUHOpyaxh6VB6 X-Received: by 10.28.17.208 with SMTP id 199mr8059740wmr.9.1490191469756; Wed, 22 Mar 2017 07:04:29 -0700 (PDT) Received: from localhost.localdomain ([160.172.77.216]) by smtp.gmail.com with ESMTPSA id 134sm507113wmj.6.2017.03.22.07.04.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 07:04:28 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com, jaben.carsey@intel.com, ruiyu.ni@intel.com, michael.d.kinney@intel.com, kelly.steele@intel.com Date: Wed, 22 Mar 2017 14:04:08 +0000 Message-Id: <1490191448-22398-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> References: <1490191448-22398-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 4/4] ArmVirtPkg/ArmVirtQemu: refer to Shell app via its declared GUID 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" Currently, the file GUID reference of the UEFI Shell app is indirected via the PCD gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile, which is set to a fixed value for our platforms. So instead, use the new symbolic GUID added for this purpose, and drop the reference to this PCD, and to the IntelFrameworkModulePkg package entirely. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 1 - ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 - ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 2 +- ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +++--- 4 files changed, 4 insertions(+), 6 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 0bbbe4a7aa4a..4f686faa559c 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -139,7 +139,6 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } # # The maximum physical I/O addressability of the processor, set with diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 71f16ed192de..6b6555c889a3 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -156,7 +156,6 @@ [PcdsFixedAtBuild.AARCH64] gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } # # The maximum physical I/O addressability of the processor, set with diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 94da51ad49f1..f9591964d577 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -691,7 +691,7 @@ PlatformBootManagerAfterConsole ( // Register UEFI Shell // PlatformRegisterFvBootOption ( - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE + &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE ); RemoveStaleFvFileOptions (); diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 1f162c663fc1..bac6c781b3c8 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -35,11 +35,11 @@ [Sources] QemuKernel.c [Packages] - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + ArmVirtPkg/ArmVirtPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec - ArmVirtPkg/ArmVirtPkg.dec + ShellPkg/ShellPkg.dec [LibraryClasses] BaseLib @@ -58,7 +58,6 @@ [LibraryClasses] UefiRuntimeServicesTableLib [FixedPcd] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity @@ -74,6 +73,7 @@ [Guids] gEfiFileSystemVolumeLabelInfoIdGuid gEfiEndOfDxeEventGroupGuid gRootBridgesConnectedEventGroupGuid + gUefiShellFileGuid [Protocols] gEfiDevicePathProtocolGuid