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