[PATCH v1 0/6] Ovmf: Drop IntelFramework[Module]Pkg dependency

[PATCH v1 0/6] Ovmf: Drop IntelFramework[Module]Pkg dependency

[Wu, Hao A]

'''
Please note that this series will be hold until the edk2-stable201905 is
created.
'''

'''
Please also note that this series has a dependency on the below series:
https://edk2.groups.io/g/devel/message/41385
(Specifically, CSM related protocols header files duplication in OvmfPkg.)
'''

The series is also available at:
https://github.com/hwu25/edk2/tree/ovmf_drop_framework_v1

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 with/without build command option '-D CSM_ENABLE';
* Boot shell pass 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/OvmfPkg.dec: Add PcdShellFile in OVMF DEC file
  OvmfPkg/PlatformBootManagerLib: Use PcdShellFile defined in OvmfPkg
  OvmfPkg/DSC: Remove the consume of PcdShellFile in framework package
  OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency
  OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency

 OvmfPkg/OvmfPkg.dec                                                      | 3 +++
 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        | 5 ++---
 OvmfPkg/PlatformPei/PlatformPei.inf                                      | 3 +--
 8 files changed, 7 insertions(+), 14 deletions(-)

-- 
2.12.0.windows.1

[PATCH v1 1/6] OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC

[Wu, Hao A]

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: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.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

[PATCH v1 2/6] OvmfPkg/OvmfPkg.dec: Add PcdShellFile in OVMF DEC file

[Wu, Hao A]

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

OVMF is currently using the PCD 'PcdShellFile' defined in
IntelFrameworkModulePkg.

This commit will add this PCD into the OVMF DEC file in order to drop
OVMF's dependency on IntelFrameworkModulePkg. The PCD token value 0x17 is
selected to fill the hole (seems the only one left) in OvmfPkg.

Please note that, instead of adding the PCD under section:
[PcdsFixedAtBuild, PcdsPatchableInModule]

as in IntelFrameworkModulePkg.dec file, it is added in section:
[PcdsFixedAtBuild]

in OvmfPkg.dec instead.

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/OvmfPkg.dec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 9640360f62..38a2d4763d 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -160,6 +160,9 @@ [PcdsFixedAtBuild]
   #  For the corresponding bits, 0 = Edge triggered and 1 = Level triggered.
   gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0000|UINT16|0x5
 
+  ## FFS filename to find the shell application.
+  gUefiOvmfPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }|VOID*|0x17
+
   ## Indicates if BiosVideo driver will switch to 80x25 Text VGA Mode when
   #  exiting boot service.
   #   TRUE  - Switch to Text VGA Mode.
-- 
2.12.0.windows.1

[PATCH v1 3/6] OvmfPkg/PlatformBootManagerLib: Use PcdShellFile defined in OvmfPkg

[Wu, Hao A]

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

This commit will update the PlatformBootManagerLib to consume the PCD
'PcdShellFile' defined in OvmfPkg (rather than the one in
IntelFrameworkModulePkg). And will update the driver to drop its
dependency on IntelFrameworkModulePkg.

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/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index d25e0a417f..681ff7e88d 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,7 +29,6 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
   SourceLevelDebugPkg/SourceLevelDebugPkg.dec
   OvmfPkg/OvmfPkg.dec
   SecurityPkg/SecurityPkg.dec
@@ -60,7 +59,7 @@ [Pcd]
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
+  gUefiOvmfPkgTokenSpaceGuid.PcdShellFile
 
 [Pcd.IA32, Pcd.X64]
   gEfiMdePkgTokenSpaceGuid.PcdFSBClock
-- 
2.12.0.windows.1

[PATCH v1 4/6] OvmfPkg/DSC: Remove the consume of PcdShellFile in framework package

[Wu, Hao A]

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

This commit will remove the consume of:

gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile

from OvmfPkg DSC files.

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 --
 3 files changed, 6 deletions(-)

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 94d8af6b8a..8264250821 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -501,8 +501,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 5d9c688e8b..94188124b8 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -507,8 +507,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 3a9d25ba4a..1b2d62529e 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -506,8 +506,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
-- 
2.12.0.windows.1

[PATCH v1 5/6] OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency

[Wu, Hao A]

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: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.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

[PATCH v1 6/6] OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency

[Wu, Hao A]

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: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.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

Re: [edk2-devel] [PATCH v1 1/6] OvmfPkg/PlatformPei: Remove redundant reference of framework pkg DEC

[Laszlo Ersek]

On 05/27/19 07:19, Wu, Hao A wrote:
> 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: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.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
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Re: [edk2-devel] [PATCH v1 2/6] OvmfPkg/OvmfPkg.dec: Add PcdShellFile in OVMF DEC file

[Laszlo Ersek]

Hi Hao,

On 05/27/19 07:19, Wu, Hao A wrote:
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1843
> 
> OVMF is currently using the PCD 'PcdShellFile' defined in
> IntelFrameworkModulePkg.
> 
> This commit will add this PCD into the OVMF DEC file in order to drop
> OVMF's dependency on IntelFrameworkModulePkg. The PCD token value 0x17 is
> selected to fill the hole (seems the only one left) in OvmfPkg.
> 
> Please note that, instead of adding the PCD under section:
> [PcdsFixedAtBuild, PcdsPatchableInModule]
> 
> as in IntelFrameworkModulePkg.dec file, it is added in section:
> [PcdsFixedAtBuild]
> 
> in OvmfPkg.dec instead.

Please replace patches #2 through #4 with the following approach:

- eliminate PcdShellFile completely, from OvmfPkg

- in PlatformBootManagerLib, please consume gUefiShellFileGuid, from
ShellPkg.dec.

(This is what ArmPkg and ArmVirtPkg do.)

Thanks!
Laszlo

> 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/OvmfPkg.dec | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
> index 9640360f62..38a2d4763d 100644
> --- a/OvmfPkg/OvmfPkg.dec
> +++ b/OvmfPkg/OvmfPkg.dec
> @@ -160,6 +160,9 @@ [PcdsFixedAtBuild]
>    #  For the corresponding bits, 0 = Edge triggered and 1 = Level triggered.
>    gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0000|UINT16|0x5
>  
> +  ## FFS filename to find the shell application.
> +  gUefiOvmfPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }|VOID*|0x17
> +
>    ## Indicates if BiosVideo driver will switch to 80x25 Text VGA Mode when
>    #  exiting boot service.
>    #   TRUE  - Switch to Text VGA Mode.
> 

Re: [edk2-devel] [PATCH v1 5/6] OvmfPkg/IncompatiblePciDeviceSupportDxe: Drop framework pkg dependency

[Laszlo Ersek]

On 05/27/19 07:19, Wu, Hao A wrote:
> 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: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.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
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Re: [edk2-devel] [PATCH v1 6/6] OvmfPkg/Csm/CsmSupportLib: Drop IntelFrameworkPkg dependency

[Laszlo Ersek]

On 05/27/19 07:19, Wu, Hao A wrote:
> 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: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.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]
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Re: [edk2-devel] [PATCH v1 2/6] OvmfPkg/OvmfPkg.dec: Add PcdShellFile in OVMF DEC file

[Wu, Hao A]

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Thursday, June 13, 2019 10:42 PM
> To: devel@edk2.groups.io; Wu, Hao A
> Cc: Ni, Ray; Justen, Jordan L; Ard Biesheuvel
> Subject: Re: [edk2-devel] [PATCH v1 2/6] OvmfPkg/OvmfPkg.dec: Add
> PcdShellFile in OVMF DEC file
> 
> Hi Hao,
> 
> On 05/27/19 07:19, Wu, Hao A wrote:
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1843
> >
> > OVMF is currently using the PCD 'PcdShellFile' defined in
> > IntelFrameworkModulePkg.
> >
> > This commit will add this PCD into the OVMF DEC file in order to drop
> > OVMF's dependency on IntelFrameworkModulePkg. The PCD token value
> 0x17 is
> > selected to fill the hole (seems the only one left) in OvmfPkg.
> >
> > Please note that, instead of adding the PCD under section:
> > [PcdsFixedAtBuild, PcdsPatchableInModule]
> >
> > as in IntelFrameworkModulePkg.dec file, it is added in section:
> > [PcdsFixedAtBuild]
> >
> > in OvmfPkg.dec instead.
> 
> Please replace patches #2 through #4 with the following approach:
> 
> - eliminate PcdShellFile completely, from OvmfPkg
> 
> - in PlatformBootManagerLib, please consume gUefiShellFileGuid, from
> ShellPkg.dec.
> 
> (This is what ArmPkg and ArmVirtPkg do.)


Got it.

A new series has been sent out to address this.
Replaced patch #2~#4 with the last patch of the new series:
https://edk2.groups.io/g/devel/message/42415

Best Regards,
Hao Wu


> 
> Thanks!
> Laszlo
> 
> > 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/OvmfPkg.dec | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
> > index 9640360f62..38a2d4763d 100644
> > --- a/OvmfPkg/OvmfPkg.dec
> > +++ b/OvmfPkg/OvmfPkg.dec
> > @@ -160,6 +160,9 @@ [PcdsFixedAtBuild]
> >    #  For the corresponding bits, 0 = Edge triggered and 1 = Level triggered.
> >
> gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0000|UIN
> T16|0x5
> >
> > +  ## FFS filename to find the shell application.
> > +  gUefiOvmfPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C,
> 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4,
> 0xD1 }|VOID*|0x17
> > +
> >    ## Indicates if BiosVideo driver will switch to 80x25 Text VGA Mode when
> >    #  exiting boot service.
> >    #   TRUE  - Switch to Text VGA Mode.
> >
> 
> 
>