* [PATCH v3 0/4] Ovmf: Drop IntelFramework[Module]Pkg dependency
@ 2019-06-14 5:18 Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 1/4] OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC Wu, Hao A
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Wu, Hao A @ 2019-06-14 5:18 UTC (permalink / raw)
To: devel
Cc: Hao A Wu, Ray Ni, David Woodhouse, Jordan Justen, Laszlo Ersek,
Ard Biesheuvel
The series is also available at:
https://github.com/hwu25/edk2/tree/ovmf_drop_framework_v3
V3 changes:
* Abandon the changes made in V2. Since the duplication of required CSM
modules by OvmfPkg is done (rather than drop the CSM support on OVMF).
* Use the symbolic GUID already defined in ShellPkg to refer the UEFI
Shell app, instead of using the PCD
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile.
V2 history:
* Update to module OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf has been
dropped, since the module is proposed to be removed in another series:
https://edk2.groups.io/g/devel/message/42142
* Copy LegacyBios protocol definitions from IntelFrameworkPkg, since
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
has a dependency on it. This was not done in V1 series since such copy
was previous covered by another series to duplicate the required CSM
modules into OvmfPkg. (Now this series has been dropped.)
V1 history:
The series will drop the IntelFramework[Module]Pkg dependency for below
modules within OvmfPkg:
OvmfPkg/PlatformPei/PlatformPei.inf
OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf
Verification done for the series:
* Build pass for OvmfPkg;
* Boot to shell with the built images.
Cc: Ray Ni <ray.ni@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Hao A Wu (6):
OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC
OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency
OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency
OvmfPkg: Refer to Shell app via its declared GUID
OvmfPkg/OvmfPkgIa32.dsc | 2 --
OvmfPkg/OvmfPkgIa32X64.dsc | 2 --
OvmfPkg/OvmfPkgX64.dsc | 2 --
OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf | 3 +--
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf | 1 -
OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +++---
OvmfPkg/PlatformPei/PlatformPei.inf | 3 +--
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 4 ++--
8 files changed, 7 insertions(+), 16 deletions(-)
--
2.12.0.windows.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/4] OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC
2019-06-14 5:18 [PATCH v3 0/4] Ovmf: Drop IntelFramework[Module]Pkg dependency Wu, Hao A
@ 2019-06-14 5:18 ` Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 2/4] OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency Wu, Hao A
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Wu, Hao A @ 2019-06-14 5:18 UTC (permalink / raw)
To: devel; +Cc: Hao A Wu, Ray Ni, Jordan Justen, Ard Biesheuvel
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1843
For the driver's INF file, this commit will remove the redundant reference
to 'IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec'.
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>
---
OvmfPkg/PlatformPei/PlatformPei.inf | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index f660c2d9e4..d9fd9c8f05 100644
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -2,7 +2,7 @@
# Platform PEI driver
#
# This module provides platform specific function to detect boot mode.
-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -36,7 +36,6 @@ [Sources]
Xen.h
[Packages]
- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
SecurityPkg/SecurityPkg.dec
--
2.12.0.windows.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/4] OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency
2019-06-14 5:18 [PATCH v3 0/4] Ovmf: Drop IntelFramework[Module]Pkg dependency Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 1/4] OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC Wu, Hao A
@ 2019-06-14 5:18 ` Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 3/4] OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID Wu, Hao A
3 siblings, 0 replies; 7+ messages in thread
From: Wu, Hao A @ 2019-06-14 5:18 UTC (permalink / raw)
To: devel; +Cc: Hao A Wu, Ray Ni, David Woodhouse, Jordan Justen, Ard Biesheuvel
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1843
This commit will drop the driver's dependency on the IntelFrameworkPkg:
gEfiLegacyBiosProtocolGuid
Such dependency has already been addressed by the duplication of the above
definition from IntelFrameworkPkg into the OvmfPkg.
Cc: Ray Ni <ray.ni@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
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>
---
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf | 1 -
1 file changed, 1 deletion(-)
diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
index e13577530d..f08b6f4bd4 100644
--- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
+++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
@@ -20,7 +20,6 @@ [Sources]
IncompatiblePciDeviceSupport.c
[Packages]
- IntelFrameworkPkg/IntelFrameworkPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
OvmfPkg/OvmfPkg.dec
--
2.12.0.windows.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 3/4] OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency
2019-06-14 5:18 [PATCH v3 0/4] Ovmf: Drop IntelFramework[Module]Pkg dependency Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 1/4] OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 2/4] OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency Wu, Hao A
@ 2019-06-14 5:18 ` Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID Wu, Hao A
3 siblings, 0 replies; 7+ messages in thread
From: Wu, Hao A @ 2019-06-14 5:18 UTC (permalink / raw)
To: devel; +Cc: Hao A Wu, Ray Ni, David Woodhouse, Jordan Justen, Ard Biesheuvel
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1843
This commit will update the INF file of the CsmSupportLib to drop its
dependency on IntelFrameworkPkg:
gEfiLegacyBiosPlatformProtocolGuid
gEfiLegacyBiosProtocolGuid
gEfiLegacyInterruptProtocolGuid
The above dependencies have already been addressed by the duplication of
these definitions from IntelFrameworkPkg to OvmfPkg.
Cc: Ray Ni <ray.ni@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
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>
---
OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf b/OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf
index 229f2e0b4b..45f201f07b 100644
--- a/OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf
+++ b/OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf
@@ -1,7 +1,7 @@
## @file
# Platform CSM Support Library
#
-# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -34,7 +34,6 @@ [Sources]
[Packages]
MdePkg/MdePkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
OvmfPkg/OvmfPkg.dec
[Pcd]
--
2.12.0.windows.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID
2019-06-14 5:18 [PATCH v3 0/4] Ovmf: Drop IntelFramework[Module]Pkg dependency Wu, Hao A
` (2 preceding siblings ...)
2019-06-14 5:18 ` [PATCH v3 3/4] OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency Wu, Hao A
@ 2019-06-14 5:18 ` Wu, Hao A
2019-06-14 20:32 ` [edk2-devel] " Laszlo Ersek
3 siblings, 1 reply; 7+ messages in thread
From: Wu, Hao A @ 2019-06-14 5:18 UTC (permalink / raw)
To: devel; +Cc: Hao A Wu, Ray Ni, Jordan Justen, Laszlo Ersek, Ard Biesheuvel
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: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
OvmfPkg/OvmfPkgIa32.dsc | 2 --
OvmfPkg/OvmfPkgIa32X64.dsc | 2 --
OvmfPkg/OvmfPkgX64.dsc | 2 --
OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +++---
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 4 ++--
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 6830e361bf..473eaba246 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -503,8 +503,6 @@ [PcdsFixedAtBuild]
#
!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
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
!endif
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 372161365c..73f33b7218 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -509,8 +509,6 @@ [PcdsFixedAtBuild.X64]
#
!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
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
!endif
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index e0c60bc5dc..39ac791565 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -508,8 +508,6 @@ [PcdsFixedAtBuild]
#
!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
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
!endif
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index d25e0a417f..060a3ab4c5 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -1,7 +1,7 @@
## @file
# 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
#
##
@@ -29,10 +29,10 @@ [Sources]
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
SourceLevelDebugPkg/SourceLevelDebugPkg.dec
OvmfPkg/OvmfPkg.dec
SecurityPkg/SecurityPkg.dec
+ ShellPkg/ShellPkg.dec
[LibraryClasses]
BaseLib
@@ -60,7 +60,6 @@ [Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
[Pcd.IA32, Pcd.X64]
gEfiMdePkgTokenSpaceGuid.PcdFSBClock
@@ -77,3 +76,4 @@ [Guids]
gEfiXenInfoGuid
gEfiEndOfDxeEventGroupGuid
gRootBridgesConnectedEventGroupGuid
+ gUefiShellFileGuid
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 5b15d3bb12..797731a41c 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -1,7 +1,7 @@
/** @file
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
**/
@@ -1532,7 +1532,7 @@ PlatformBootManagerAfterConsole (
// Register UEFI Shell
//
PlatformRegisterFvBootOption (
- PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE
+ &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
);
RemoveStaleFvFileOptions ();
--
2.12.0.windows.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID
2019-06-14 5:18 ` [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID Wu, Hao A
@ 2019-06-14 20:32 ` Laszlo Ersek
2019-06-17 1:28 ` Wu, Hao A
0 siblings, 1 reply; 7+ messages in thread
From: Laszlo Ersek @ 2019-06-14 20:32 UTC (permalink / raw)
To: devel, hao.a.wu; +Cc: Ray Ni, Jordan Justen, Ard Biesheuvel
On 06/14/19 07:18, Wu, Hao A wrote:
> 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: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
> OvmfPkg/OvmfPkgIa32.dsc | 2 --
> OvmfPkg/OvmfPkgIa32X64.dsc | 2 --
> OvmfPkg/OvmfPkgX64.dsc | 2 --
> OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 6 +++---
> OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 4 ++--
> 5 files changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 6830e361bf..473eaba246 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -503,8 +503,6 @@ [PcdsFixedAtBuild]
> #
> !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
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> !endif
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index 372161365c..73f33b7218 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -509,8 +509,6 @@ [PcdsFixedAtBuild.X64]
> #
> !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
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> !endif
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index e0c60bc5dc..39ac791565 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -508,8 +508,6 @@ [PcdsFixedAtBuild]
> #
> !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
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> !endif
> diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> index d25e0a417f..060a3ab4c5 100644
> --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> @@ -1,7 +1,7 @@
> ## @file
> # 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
> #
> ##
> @@ -29,10 +29,10 @@ [Sources]
> [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> SourceLevelDebugPkg/SourceLevelDebugPkg.dec
> OvmfPkg/OvmfPkg.dec
> SecurityPkg/SecurityPkg.dec
> + ShellPkg/ShellPkg.dec
>
> [LibraryClasses]
> BaseLib
> @@ -60,7 +60,6 @@ [Pcd]
> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
> - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
>
> [Pcd.IA32, Pcd.X64]
> gEfiMdePkgTokenSpaceGuid.PcdFSBClock
> @@ -77,3 +76,4 @@ [Guids]
> gEfiXenInfoGuid
> gEfiEndOfDxeEventGroupGuid
> gRootBridgesConnectedEventGroupGuid
> + gUefiShellFileGuid
> diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> index 5b15d3bb12..797731a41c 100644
> --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> @@ -1,7 +1,7 @@
> /** @file
> 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
>
> **/
> @@ -1532,7 +1532,7 @@ PlatformBootManagerAfterConsole (
> // Register UEFI Shell
> //
> PlatformRegisterFvBootOption (
> - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE
> + &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
> );
>
> RemoveStaleFvFileOptions ();
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thank you!
Laszlo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID
2019-06-14 20:32 ` [edk2-devel] " Laszlo Ersek
@ 2019-06-17 1:28 ` Wu, Hao A
0 siblings, 0 replies; 7+ messages in thread
From: Wu, Hao A @ 2019-06-17 1:28 UTC (permalink / raw)
To: devel@edk2.groups.io, lersek@redhat.com
Cc: Ni, Ray, Justen, Jordan L, Ard Biesheuvel
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Saturday, June 15, 2019 4:33 AM
> To: devel@edk2.groups.io; Wu, Hao A
> Cc: Ni, Ray; Justen, Jordan L; Ard Biesheuvel
> Subject: Re: [edk2-devel] [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its
> declared GUID
>
> On 06/14/19 07:18, Wu, Hao A wrote:
> > 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: Laszlo Ersek <lersek@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> > ---
> > OvmfPkg/OvmfPkgIa32.dsc | 2 --
> > OvmfPkg/OvmfPkgIa32X64.dsc | 2 --
> > OvmfPkg/OvmfPkgX64.dsc | 2 --
> > OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |
> 6 +++---
> > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 4 ++--
> > 5 files changed, 5 insertions(+), 11 deletions(-)
> >
> > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> > index 6830e361bf..473eaba246 100644
> > --- a/OvmfPkg/OvmfPkgIa32.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32.dsc
> > @@ -503,8 +503,6 @@ [PcdsFixedAtBuild]
> > #
> > !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
> > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> > !endif
> > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc
> b/OvmfPkg/OvmfPkgIa32X64.dsc
> > index 372161365c..73f33b7218 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> > @@ -509,8 +509,6 @@ [PcdsFixedAtBuild.X64]
> > #
> > !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
> > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> > !endif
> > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> > index e0c60bc5dc..39ac791565 100644
> > --- a/OvmfPkg/OvmfPkgX64.dsc
> > +++ b/OvmfPkg/OvmfPkgX64.dsc
> > @@ -508,8 +508,6 @@ [PcdsFixedAtBuild]
> > #
> > !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
> > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> > !endif
> > diff --git
> a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> > index d25e0a417f..060a3ab4c5 100644
> > ---
> a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> > +++
> b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> > @@ -1,7 +1,7 @@
> > ## @file
> > # 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
> > #
> > ##
> > @@ -29,10 +29,10 @@ [Sources]
> > [Packages]
> > MdePkg/MdePkg.dec
> > MdeModulePkg/MdeModulePkg.dec
> > - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> > SourceLevelDebugPkg/SourceLevelDebugPkg.dec
> > OvmfPkg/OvmfPkg.dec
> > SecurityPkg/SecurityPkg.dec
> > + ShellPkg/ShellPkg.dec
> >
> > [LibraryClasses]
> > BaseLib
> > @@ -60,7 +60,6 @@ [Pcd]
> > gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
> > gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
> > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
> > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
> >
> > [Pcd.IA32, Pcd.X64]
> > gEfiMdePkgTokenSpaceGuid.PcdFSBClock
> > @@ -77,3 +76,4 @@ [Guids]
> > gEfiXenInfoGuid
> > gEfiEndOfDxeEventGroupGuid
> > gRootBridgesConnectedEventGroupGuid
> > + gUefiShellFileGuid
> > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> > index 5b15d3bb12..797731a41c 100644
> > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
> > @@ -1,7 +1,7 @@
> > /** @file
> > 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
> >
> > **/
> > @@ -1532,7 +1532,7 @@ PlatformBootManagerAfterConsole (
> > // Register UEFI Shell
> > //
> > PlatformRegisterFvBootOption (
> > - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE
> > + &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
> > );
> >
> > RemoveStaleFvFileOptions ();
> >
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks Laszlo,
Series pushed via commits 6764fb9cd8..84f736a73e.
Best Regards,
Hao Wu
>
> Thank you!
> Laszlo
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-06-17 1:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-14 5:18 [PATCH v3 0/4] Ovmf: Drop IntelFramework[Module]Pkg dependency Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 1/4] OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 2/4] OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 3/4] OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency Wu, Hao A
2019-06-14 5:18 ` [PATCH v3 4/4] OvmfPkg: Refer to Shell app via its declared GUID Wu, Hao A
2019-06-14 20:32 ` [edk2-devel] " Laszlo Ersek
2019-06-17 1:28 ` Wu, Hao A
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox