tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-21 20:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg: Refer to Shell app via its declared GUID

Browse Source 
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1843

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 OvmfPkg.

So instead, use the symbolic GUID in ShellPkg for this purpose, and drop
the reference to this PCD, and to the IntelFrameworkModulePkg package
entirely.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Hao A Wu 2019-06-14 09:14:29 +08:00
parent ae71eae151
commit 84f736a73e
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Platform BDS customizations. Platform BDS customizations.
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -1532,7 +1532,7 @@ PlatformBootManagerAfterConsole (
// Register UEFI Shell // Register UEFI Shell
// //
PlatformRegisterFvBootOption ( PlatformRegisterFvBootOption (
PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
); );
RemoveStaleFvFileOptions (); RemoveStaleFvFileOptions ();

6
OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
View File

@ -1,7 +1,7 @@
## @file ## @file
# Platform BDS customizations library. # Platform BDS customizations library.
# #
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
## ##
@ -29,10 +29,10 @@
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
SourceLevelDebugPkg/SourceLevelDebugPkg.dec SourceLevelDebugPkg/SourceLevelDebugPkg.dec
OvmfPkg/OvmfPkg.dec OvmfPkg/OvmfPkg.dec
SecurityPkg/SecurityPkg.dec SecurityPkg/SecurityPkg.dec
ShellPkg/ShellPkg.dec
[LibraryClasses] [LibraryClasses]
BaseLib BaseLib
@ -60,7 +60,6 @@
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
[Pcd.IA32, Pcd.X64] [Pcd.IA32, Pcd.X64]
gEfiMdePkgTokenSpaceGuid.PcdFSBClock gEfiMdePkgTokenSpaceGuid.PcdFSBClock
@ -77,3 +76,4 @@
gEfiXenInfoGuid gEfiXenInfoGuid
gEfiEndOfDxeEventGroupGuid gEfiEndOfDxeEventGroupGuid
gRootBridgesConnectedEventGroupGuid gRootBridgesConnectedEventGroupGuid
gUefiShellFileGuid

2
OvmfPkg/OvmfPkgIa32.dsc
View File

@ -503,8 +503,6 @@
# #
!include NetworkPkg/NetworkPcds.dsc.inc !include NetworkPkg/NetworkPcds.dsc.inc
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
!if $(SMM_REQUIRE) == TRUE !if $(SMM_REQUIRE) == TRUE
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
!endif !endif

2
OvmfPkg/OvmfPkgIa32X64.dsc
View File

@ -509,8 +509,6 @@
# #
!include NetworkPkg/NetworkPcds.dsc.inc !include NetworkPkg/NetworkPcds.dsc.inc
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
!if $(SMM_REQUIRE) == TRUE !if $(SMM_REQUIRE) == TRUE
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
!endif !endif

2
OvmfPkg/OvmfPkgX64.dsc
View File

@ -508,8 +508,6 @@
# #
!include NetworkPkg/NetworkPcds.dsc.inc !include NetworkPkg/NetworkPcds.dsc.inc
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
!if $(SMM_REQUIRE) == TRUE !if $(SMM_REQUIRE) == TRUE
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
!endif !endif