[PATCH v1 0/2] EmbeddedPkg: Drop IntelFramework[Module]Pkg dependency

[PATCH v1 0/2] EmbeddedPkg: Drop IntelFramework[Module]Pkg dependency

[Wu, Hao A]

The series will remove EmbeddedPkg's dependency on IntelFrameworkPkg and
IntelFrameworkModulePkg.

Tests done:
Package level build pass for GCC5 tool chain on ARM and AARCH64 archs.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Hao A Wu (2):
  EmbeddedPkg DSC: Use ReportStatusCodeLib (DXE) in MdeModulePkg
  EmbeddedPkg/PrePiLib: Drop dependency on IntelFramework[Module]Pkg

 EmbeddedPkg/EmbeddedPkg.dsc                     | 6 +++---
 EmbeddedPkg/Library/PrePiLib/PrePiLib.inf       | 3 ---
 EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

-- 
2.12.0.windows.1

[PATCH v1 1/2] EmbeddedPkg DSC: Use ReportStatusCodeLib (DXE) in MdeModulePkg

[Wu, Hao A]

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

This commit will update the package DSC file to consume the
ReportStatusCodeLib (DXE phase instance) in MdeModulePkg, instead of using
the one in IntelFrameworkModulePkg.

Please note that, the 2 ReportStatusCodeLib are almost identical. Thus,
there is no functional impact for this commit.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 EmbeddedPkg/EmbeddedPkg.dsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index b8b6ac90c0..b487337909 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -105,16 +105,16 @@
 
 [LibraryClasses.common.DXE_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
 
 
 [LibraryClasses.common.UEFI_APPLICATION]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
 
 [LibraryClasses.common.UEFI_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
 
 [LibraryClasses.common.SEC]
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
-- 
2.12.0.windows.1

Re: [PATCH v1 1/2] EmbeddedPkg DSC: Use ReportStatusCodeLib (DXE) in MdeModulePkg

[Ard Biesheuvel]

On Tue, 14 May 2019 at 09:33, Hao A Wu <hao.a.wu@intel.com> wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1720
>
> This commit will update the package DSC file to consume the
> ReportStatusCodeLib (DXE phase instance) in MdeModulePkg, instead of using
> the one in IntelFrameworkModulePkg.
>
> Please note that, the 2 ReportStatusCodeLib are almost identical. Thus,
> there is no functional impact for this commit.
>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Can we use the NULL status code library here?

> ---
>  EmbeddedPkg/EmbeddedPkg.dsc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
> index b8b6ac90c0..b487337909 100644
> --- a/EmbeddedPkg/EmbeddedPkg.dsc
> +++ b/EmbeddedPkg/EmbeddedPkg.dsc
> @@ -105,16 +105,16 @@
>
>  [LibraryClasses.common.DXE_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> -  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
>
>  [LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> -  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
>  [LibraryClasses.common.UEFI_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> -  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
>  [LibraryClasses.common.SEC]
>    ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
> --
> 2.12.0.windows.1
>

Re: [PATCH v1 1/2] EmbeddedPkg DSC: Use ReportStatusCodeLib (DXE) in MdeModulePkg

[Ard Biesheuvel]

On Fri, 17 May 2019 at 17:50, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> On Tue, 14 May 2019 at 09:33, Hao A Wu <hao.a.wu@intel.com> wrote:
> >
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1720
> >
> > This commit will update the package DSC file to consume the
> > ReportStatusCodeLib (DXE phase instance) in MdeModulePkg, instead of using
> > the one in IntelFrameworkModulePkg.
> >
> > Please note that, the 2 ReportStatusCodeLib are almost identical. Thus,
> > there is no functional impact for this commit.
> >
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
>
> Can we use the NULL status code library here?
>

Never mind - this is already merged, and I noticed PrePiLib actuall
includes a status code router, so it makes sense to use the versions
below.

> > ---
> >  EmbeddedPkg/EmbeddedPkg.dsc | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
> > index b8b6ac90c0..b487337909 100644
> > --- a/EmbeddedPkg/EmbeddedPkg.dsc
> > +++ b/EmbeddedPkg/EmbeddedPkg.dsc
> > @@ -105,16 +105,16 @@
> >
> >  [LibraryClasses.common.DXE_DRIVER]
> >    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> > -  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> >
> >  [LibraryClasses.common.UEFI_APPLICATION]
> >    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> > -  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> >  [LibraryClasses.common.UEFI_DRIVER]
> >    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> > -  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> >  [LibraryClasses.common.SEC]
> >    ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
> > --
> > 2.12.0.windows.1
> >

[PATCH v1 2/2] EmbeddedPkg/PrePiLib: Drop dependency on IntelFramework[Module]Pkg

[Wu, Hao A]

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

This commit will remove the dependency on IntelFramework[Module]Pkg from
the PrePiLib.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 EmbeddedPkg/Library/PrePiLib/PrePiLib.inf       | 3 ---
 EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c | 1 -
 2 files changed, 4 deletions(-)

diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
index 9446bc47df..bdedb8d666 100644
--- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
+++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
@@ -35,9 +35,6 @@
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  IntelFrameworkPkg/IntelFrameworkPkg.dec              # needed to support StatusCodes
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec  # needed to support StatusCodes
-
 
 [LibraryClasses]
   BaseLib
diff --git a/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c b/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c
index c56d2318fd..043cf5e9cd 100644
--- a/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c
+++ b/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c
@@ -15,7 +15,6 @@
 #include <Protocol/StatusCode.h>
 #include <Guid/StatusCodeDataTypeId.h>
 #include <Guid/StatusCodeDataTypeDebug.h>
-#include <FrameworkPei.h>
 
 EFI_STATUS
 EFIAPI
-- 
2.12.0.windows.1

Re: [PATCH v1 0/2] EmbeddedPkg: Drop IntelFramework[Module]Pkg dependency

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Wu, Hao A
> Sent: Tuesday, May 14, 2019 3:34 PM
> To: devel@edk2.groups.io
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Leif
> Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>
> Subject: [PATCH v1 0/2] EmbeddedPkg: Drop IntelFramework[Module]Pkg
> dependency
> 
> The series will remove EmbeddedPkg's dependency on IntelFrameworkPkg
> and IntelFrameworkModulePkg.
> 
> Tests done:
> Package level build pass for GCC5 tool chain on ARM and AARCH64 archs.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> Hao A Wu (2):
>   EmbeddedPkg DSC: Use ReportStatusCodeLib (DXE) in MdeModulePkg
>   EmbeddedPkg/PrePiLib: Drop dependency on IntelFramework[Module]Pkg
> 
>  EmbeddedPkg/EmbeddedPkg.dsc                     | 6 +++---
>  EmbeddedPkg/Library/PrePiLib/PrePiLib.inf       | 3 ---
>  EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c | 1 -
>  3 files changed, 3 insertions(+), 7 deletions(-)
> 
> --
> 2.12.0.windows.1

Re: [PATCH v1 0/2] EmbeddedPkg: Drop IntelFramework[Module]Pkg dependency

[Leif Lindholm]

On Tue, May 14, 2019 at 03:33:41PM +0800, Hao A Wu wrote:
> The series will remove EmbeddedPkg's dependency on IntelFrameworkPkg and
> IntelFrameworkModulePkg.
> 
> Tests done:
> Package level build pass for GCC5 tool chain on ARM and AARCH64 archs.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>

For series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> Hao A Wu (2):
>   EmbeddedPkg DSC: Use ReportStatusCodeLib (DXE) in MdeModulePkg
>   EmbeddedPkg/PrePiLib: Drop dependency on IntelFramework[Module]Pkg
> 
>  EmbeddedPkg/EmbeddedPkg.dsc                     | 6 +++---
>  EmbeddedPkg/Library/PrePiLib/PrePiLib.inf       | 3 ---
>  EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c | 1 -
>  3 files changed, 3 insertions(+), 7 deletions(-)
> 
> -- 
> 2.12.0.windows.1
> 

Re: [PATCH v1 0/2] EmbeddedPkg: Drop IntelFramework[Module]Pkg dependency

[Wu, Hao A]

> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> Sent: Tuesday, May 14, 2019 11:27 PM
> To: Wu, Hao A
> Cc: devel@edk2.groups.io; Ni, Ray; Ard Biesheuvel
> Subject: Re: [PATCH v1 0/2] EmbeddedPkg: Drop IntelFramework[Module]Pkg
> dependency
> 
> On Tue, May 14, 2019 at 03:33:41PM +0800, Hao A Wu wrote:
> > The series will remove EmbeddedPkg's dependency on IntelFrameworkPkg
> and
> > IntelFrameworkModulePkg.
> >
> > Tests done:
> > Package level build pass for GCC5 tool chain on ARM and AARCH64 archs.
> >
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> For series:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Thanks Ray and Leif,

Series has been pushed via commit: e90ea9470a..32f345eba7

Best Regards,
Hao Wu

> 
> 
> > Hao A Wu (2):
> >   EmbeddedPkg DSC: Use ReportStatusCodeLib (DXE) in MdeModulePkg
> >   EmbeddedPkg/PrePiLib: Drop dependency on IntelFramework[Module]Pkg
> >
> >  EmbeddedPkg/EmbeddedPkg.dsc                     | 6 +++---
> >  EmbeddedPkg/Library/PrePiLib/PrePiLib.inf       | 3 ---
> >  EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c | 1 -
> >  3 files changed, 3 insertions(+), 7 deletions(-)
> >
> > --
> > 2.12.0.windows.1
> >