From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Cc: Ard Biesheuvel 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: [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: , X-List-Received-Date: Wed, 22 Mar 2017 14:04:28 -0000 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(-) 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 -- 2.7.4