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