[edk2] [PATCH] BaseTools:Coding problems caused by special characters

[Fan, ZhijuX]

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1670

During BaseTools compiling under Chinese or Japanese
language Windows, python exception occurring.
UnicodeDecodeError: 'ascii' codec can't decode byte 0xbd
in position 3528: ordinal not in range(128)

Cc: Bob Feng 
Cc: Liming Gao 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan 
---
 BaseTools/Source/C/Makefiles/NmakeSubdirs.py  | 2 +-
 BaseTools/Source/Python/Capsule/GenerateCapsule.py| 8 
 BaseTools/Source/Python/Common/Misc.py| 2 +-
 BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py| 2 +-
 .../Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py  | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py 
b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py
index 29bb5dfa72..abcbea89a4 100644
--- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py
+++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py
@@ -44,7 +44,7 @@ def RunCommand(WorkDir=None, *Args, **kwargs):
 stdout, stderr = p.communicate()
 message = ""
 if stdout is not None:
-message = stdout.decode() #for compatibility in python 2 and 3
+message = stdout.decode(encoding='utf-8', errors='ignore') #for 
compatibility in python 2 and 3
 
 if p.returncode != 0:
 raise RuntimeError("Error while execute command \'{0}\' in direcotry 
{1}\n{2}".format(" ".join(Args), WorkDir, message))
diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py 
b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
index 7b08918857..5ce5daef68 100644
--- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py
+++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
@@ -94,7 +94,7 @@ def SignPayloadSignTool (Payload, ToolPath, PfxFile):
 
 if Process.returncode != 0:
 shutil.rmtree (TempDirectoryName)
-print (Result[1].decode())
+print (Result[1].decode(encoding='utf-8', errors='ignore'))
 raise ValueError ('GenerateCapsule: error: signtool failed.')
 
 #
@@ -132,12 +132,12 @@ def SignPayloadOpenSsl (Payload, ToolPath, 
SignerPrivateCertFile, OtherPublicCer
 try:
 Process = subprocess.Popen (Command, stdin = subprocess.PIPE, stdout = 
subprocess.PIPE, stderr = subprocess.PIPE, shell = True)
 Result = Process.communicate(input = Payload)
-Signature = Result[0]
+Signature = Result[0].decode(encoding='utf-8', errors='ignore')
 except:
 raise ValueError ('GenerateCapsule: error: can not run openssl.')
 
 if Process.returncode != 0:
-print (Result[1].decode())
+print (Result[1].decode(encoding='utf-8', errors='ignore'))
 raise ValueError ('GenerateCapsule: error: openssl failed.')
 
 return Signature
@@ -186,7 +186,7 @@ def VerifyPayloadOpenSsl (Payload, CertData, ToolPath, 
SignerPrivateCertFile, Ot
 
 if Process.returncode != 0:
 shutil.rmtree (TempDirectoryName)
-print (Result[1].decode())
+print (Result[1].decode(encoding='utf-8', errors='ignore'))
 raise ValueError ('GenerateCapsule: error: openssl failed.')
 
 shutil.rmtree (TempDirectoryName)
diff --git a/BaseTools/Source/Python/Common/Misc.py 
b/BaseTools/Source/Python/Common/Misc.py
index c7daf5417c..47f8e45222 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1032,7 +1032,7 @@ def ParseFieldValue (Value):
 p.stderr.close()
 if err:
 raise BadExpression("DevicePath: %s" % str(err))
-out = out.decode()
+out = out.decode(encoding='utf-8', errors='ignore')
 Size = len(out.split())
 out = ','.join(out.split())
 return '{' + out + '}', Size
diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py 
b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
index 003f052a90..706bf28e14 100644
--- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
+++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
@@ -122,7 +122,7 @@ if __name__ == '__main__':
   if Process.returncode != 0:
 print('ERROR: Open SSL command not available.  Please verify PATH or set 
OPENSSL_PATH')
 sys.exit(Process.returncode)
-  print(Version[0].decode())
+  print(Version[0].decode(encoding='utf-8', errors='ignore'))
 
   #
   # Read input file into a buffer and save input filename
diff --git 
a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py 
b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
index c0b661d03c..3cc14e3bb9 100644
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
@@ -84,7 +84,7 @@ if __name__ == '__main__':
   if Process.returncode != 0:
 print('ERROR: Open SSL command not available.  Please verify PATH or set 
OPENSSL_PATH')
 

Re: [edk2] [PATCH] UefiPayloadPkg: Enhance UEFI payload for coreboot and Slim Bootloader

[Ni, Ray]

Guo,
Just to double confirm: UefiPayloadPkg will not require Legacy8254 timer 
support.
The old packages Coreboot*Pkgs will be removed.
Which means now only QEMU/OVMF needs the Legacy8254 support.

Laszlo,
Now since QEMU/OVMF is the only consumer of the Legacy8254 driver, do you
agree that the Legacy8254 is moved to OvmfPkg?
Note: We agreed that Legacy8259 will be moved to OvmfPkg/Csm directory and
that decision is not going to be changed by this new situation.

Thanks,
Ray

> -Original Message-
> From: edk2-devel  On Behalf Of Guo
> Dong
> Sent: Friday, March 29, 2019 8:34 AM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [PATCH] UefiPayloadPkg: Enhance UEFI payload for coreboot
> and Slim Bootloader
> 
> CorebootModulePkg and CorebootPayloadPkg originally supports coreboot
> only.
> In order to support other bootloaders, such as Slim Bootloader, they need
> be updated to be more generic.
> UEFI Payload (UefiPayloadPkg) a converged package from
> CorebootModulePkg
> and CorebootPayloadPkg with following updates:
> a. Support both coreboot and Slim Bootloader
> b. Removed SataControllerDxe and BaseSerialPortLib16550 to use EDK2
> modules
> c. Support passing bootloader parameter to UEFI payload, e.g. coreboot
>table from coreboot or HOB list from Slim Bootloader
> d. Using GraphicsOutputDxe from EDK2 with minor change instead of FbGop
> e. Remove the dependency to IntelFrameworkPkg and
> IntelFrameworkModulePkg
>and QuarkSocPkg
> f. Use BaseDebugLibSerialPort library as DebugLib
> g. Use HPET timer, drop legacy 8254 timer support
> h. Use BaseXApicX2ApicLib instead of BaseXApicLib
> i. Other clean ups
> 
> On how UefiPayloadPkg could work with coreboot/Slim Bootloader, please
> refer UefiPayloadPkg/BuildAndIntegrationInstructions.txt
> 
> Once UefiPayloadPkg is checked-in, CorebootModulePkg and
> CorebootPayloadPkg
> could be retired.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Guo Dong 
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH v6] UefiCpuPkg\CpuSmm: Save & restore CR2 on-demand paging in SMM

[Ni, Ray]

> +  if ((!mCpuSmmStaticPageTable) && (Cr2 != 0)) {

Can the "Cr2 != 0" be removed? 

> -Original Message-
> From: edk2-devel  On Behalf Of
> nkvangup
> Sent: Friday, March 29, 2019 12:58 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen ; Dong, Eric ;
> Laszlo Ersek 
> Subject: [edk2] [PATCH v6] UefiCpuPkg\CpuSmm: Save & restore CR2 on-
> demand paging in SMM
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1593
> 
> For every SMI occurrence, save and restore CR2 register only when SMM on-
> demand paging support is enabled in 64 bit operation mode.
> This is not a bug but to have better improvement of code.
> 
> Patch5 is updated with separate functions for Save and Restore of CR2 based
> on review feedback.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Vanguput Narendra K 
> Cc: Eric Dong 
> Cc: Ray Ni 
> Cc: Laszlo Ersek 
> Cc: Yao Jiewen 
> ---
>  UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c   | 26
> ++
>  UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c  |  9 ++---
>  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 22
> ++
>  UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c| 30
> ++
>  4 files changed, 84 insertions(+), 3 deletions(-)
> 
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> index b734a1ea8c..af96e42982 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> @@ -316,3 +316,29 @@ SetPageTableAttributes (
> 
>return ;
>  }
> +
> +/**
> +  This function returns with no action for 32 bit.
> +
> +  @param[in]  *Cr2  Pointer to variable to hold CR2 register value **/
> +VOID
> +SaveCr2 (
> +  UINTN  *Cr2
> +  )
> +{
> +  return ;
> +}
> +
> +/**
> +  This function returns with no action for 32 bit.
> +
> +  @param[in]  Cr2  Value to write into CR2 register **/ VOID
> +RestoreCr2 (
> +  UINTN  Cr2
> +  )
> +{
> +  return ;
> +}
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> index 3b0b3b52ac..ce70f77709 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> @@ -1112,9 +1112,11 @@ SmiRendezvous (
>ASSERT(CpuIndex < mMaxNumberOfCpus);
> 
>//
> -  // Save Cr2 because Page Fault exception in SMM may override its value
> +  // Save Cr2 because Page Fault exception in SMM may override its
> + value,  // when using on-demand paging for above 4G memory.
>//
> -  Cr2 = AsmReadCr2 ();
> +  Cr2 = 0;
> +  SaveCr2 ();
> 
>//
>// Perform CPU specific entry hooks
> @@ -1253,10 +1255,11 @@ SmiRendezvous (
> 
>  Exit:
>SmmCpuFeaturesRendezvousExit (CpuIndex);
> +
>//
>// Restore Cr2
>//
> -  AsmWriteCr2 (Cr2);
> +  RestoreCr2 (Cr2);
>  }
> 
>  /**
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> index 84efb22981..c9d147c8a1 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> @@ -1243,4 +1243,26 @@ EFIAPI
>  PiSmmCpuSmiEntryFixupAddress (
>   );
> 
> +/**
> +  This function reads CR2 register when on-demand paging is enabled
> +  for 64 bit and no action for 32 bit.
> +
> +  @param[in]  *Cr2  Pointer to variable to hold CR2 register value **/
> +VOID
> +SaveCr2 (
> +  UINTN  *Cr2
> +  );
> +
> +/**
> +  This function writes into CR2 register when on-demand paging is
> +enabled
> +  for 64 bit and no action for 32 bit.
> +
> +  @param[in]  Cr2  Value to write into CR2 register **/ VOID
> +RestoreCr2 (
> +  UINTN  Cr2
> +  );
> +
>  #endif
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> index 2c77cb47a4..6cb44fbbe5 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> @@ -1053,3 +1053,33 @@ SetPageTableAttributes (
> 
>return ;
>  }
> +
> +/**
> +  This function reads CR2 register when on-demand paging is enabled
> +
> +  @param[in]  *Cr2  Pointer to variable to hold CR2 register value **/
> +VOID
> +SaveCr2 (
> +  UINTN  *Cr2
> +  )
> +{
> +  if (!mCpuSmmStaticPageTable) {
> +*Cr2 = AsmReadCr2 ();
> +  }
> +}
> +
> +/**
> +  This function restores CR2 register when on-demand paging is enabled
> +
> +  @param[in]  Cr2  Value to write into CR2 register **/ VOID
> +RestoreCr2 (
> +  UINTN  Cr2
> +  )
> +{
> +  if ((!mCpuSmmStaticPageTable) && (Cr2 != 0)) {
> +AsmWriteCr2 (Cr2);
> +  }
> +}
> --
> 2.16.2.windows.1
> 
> ___
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH V5 16/17] MdeModulePkg/PeiDebugLibDebugPpi: Add PEI debug lib

[Gao, Zhichao]

You are right. I didn't think about that.
And I have change the variable to local and tested on open MinPlatform 
(Kabylake RVP3). It works fine. And also global variable make the system hang.

Thanks,
Zhichao

> -Original Message-
> From: Ni, Ray
> Sent: Thursday, March 28, 2019 6:11 PM
> To: Gao, Zhichao ; edk2-devel@lists.01.org
> Cc: Gao, Liming ; Wang, Jian J
> ; Wu, Hao A ; Zeng, Star
> ; Sean Brogan ;
> Michael Turner ; Bret Barkelew
> 
> Subject: RE: [PATCH V5 16/17] MdeModulePkg/PeiDebugLibDebugPpi: Add
> PEI debug lib
> 
> Zhichao,
> For a PEIM, it may not be proper to have a global variable and update that
> global variable during execution.
> Because sometimes the PEIM runs from read-only SPI flash, the global
> variable cannot be updated.
> I see you have a check against NULL when using that global variable. How
> about just remove the global variable and always locate the PPI?
> 
> > -Original Message-
> > From: Gao, Zhichao 
> > Sent: Thursday, March 28, 2019 4:10 PM
> > To: edk2-devel@lists.01.org
> > Cc: Gao, Liming ; Wang, Jian J
> > ; Wu, Hao A ; Ni, Ray
> > ; Zeng, Star ; Sean Brogan
> > ; Michael Turner
> > ; Bret Barkelew
> > 
> > Subject: [PATCH V5 16/17] MdeModulePkg/PeiDebugLibDebugPpi: Add PEI
> > debug lib
> >
> > From: Liming Gao 
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1549
> >
> > Add a PEI debug library instance PeiDebugLibDebugPpi base on DebugPpi.
> > Using the combination of the DebugServicePei and this lib instance can
> > reduce the image size of PEI drivers.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Zhichao Gao 
> > Cc: Jian J Wang 
> > Cc: Hao Wu 
> > Cc: Ray Ni 
> > Cc: Star Zeng 
> > Cc: Liming Gao 
> > Cc: Sean Brogan 
> > Cc: Michael Turner 
> > Cc: Bret Barkelew 
> > Reviewed-by: Hao Wu 
> > ---
> >  .../Library/PeiDebugLibDebugPpi/DebugLib.c| 456
> ++
> >  .../PeiDebugLibDebugPpi.inf   |  56 +++
> >  2 files changed, 512 insertions(+)
> >  create mode 100644
> > MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
> >  create mode 100644
> > MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf
> >
> > diff --git a/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
> > b/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
> > new file mode 100644
> > index 00..349577e5ea
> > --- /dev/null
> > +++ b/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
> > @@ -0,0 +1,456 @@
> > +/** @file
> > +  PEI debug lib instance base on DebugPpi to save size
> > +
> > +  Copyright (c) 2019, Intel Corporation. All rights reserved.
> > +
> > +  This program and the accompanying materials  are licensed and made
> > + available under the terms and conditions of the BSD License  which
> > + accompanies this distribution.  The full text of the license may be
> > + found at  http://opensource.org/licenses/bsd-license.php
> > +
> > +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> > BASIS,
> > + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> > EXPRESS OR IMPLIED.
> > +
> > +**/
> > +
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +
> > +EDKII_DEBUG_PPI *mEdkiiDebugPpi = NULL;
> > +
> > +/**
> > +  Prints a debug message to the debug output device if the specified
> > +  error level is enabled.
> > +
> > +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> > + function  GetDebugPrintErrorLevel (), then print the message
> > + specified by Format and  the associated variable argument list to
> > + the debug output
> > device.
> > +
> > +  If Format is NULL, then ASSERT().
> > +
> > +  @param  ErrorLevelThe error level of the debug message.
> > +  @param  FormatFormat string for the debug message to print.
> > +  @param  ...   Variable argument list whose contents are accessed
> > +based on the format string specified by Format.
> > +
> > +**/
> > +VOID
> > +EFIAPI
> > +DebugPrint (
> > +  IN  UINTNErrorLevel,
> > +  IN  CONST CHAR8  *Format,
> > +  ...
> > +  )
> > +{
> > +  VA_LIST Marker;
> > +
> > +  VA_START (Marker, Format);
> > +  DebugVPrint (ErrorLevel, Format, Marker);
> > +  VA_END (Marker);
> > +}
> > +
> > +
> > +/**
> > +  Prints a debug message to the debug output device if the specified
> > +  error level is enabled.
> > +  This function use BASE_LIST which would provide a more compatible
> > +  service than VA_LIST.
> > +
> > +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> > + function  GetDebugPrintErrorLevel (), then print the message
> > + specified by Format and  the associated variable argument list to
> > + the debug output
> > device.
> > +
> > +  If Format is NULL, then ASSERT().
> > +
> > +  @param  ErrorLevel  The error level of the debug message.
> > +  @param  Format  Format string for the debug message to print.
> > + 

Re: [edk2] [PATCH v5] UefiCpuPkg\CpuSmm: Save & restore CR2 on-demand paging in SMM

[Vanguput, Narendra K]

Thanks Mike for the comments!

I updated and send as PATCH v6.
Please review.

Thanks,
Narendra

> -Original Message-
> From: Kinney, Michael D
> Sent: Saturday, March 23, 2019 12:44 AM
> To: Vanguput, Narendra K ; edk2-
> de...@lists.01.org; Kinney, Michael D 
> Cc: Yao, Jiewen ; Dong, Eric ;
> Laszlo Ersek 
> Subject: RE: [edk2] [PATCH v5] UefiCpuPkg\CpuSmm: Save & restore CR2 on-
> demand paging in SMM
> 
> Hi Narendra,
> 
> With this implementation, you have moved the save/restore location to a
> module global variable.  The name should be prefixed with 'm' to make that
> clear.
> 
>   mCr2
> 
> I do not think using a module global is MP safe.
> 
> The current implementation uses a local on the stack that is MP safe because
> each CPU has its own stack.
> 
> Mike
> 
> > -Original Message-
> > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org]
> > On Behalf Of nkvangup
> > Sent: Friday, March 22, 2019 11:50 AM
> > To: edk2-devel@lists.01.org
> > Cc: Yao, Jiewen ; Dong, Eric
> > ; Laszlo Ersek 
> > Subject: [edk2] [PATCH v5] UefiCpuPkg\CpuSmm: Save & restore CR2
> > on-demand paging in SMM
> >
> > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1593
> >
> > For every SMI occurrence, save and restore CR2 register only when SMM
> > on-demand paging support is enabled in 64 bit operation mode.
> > This is not a bug but to have better improvement of code.
> >
> > Patch5 is updated with separate functions for Save and Restore of CR2
> > based on review feedback.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Vanguput Narendra K
> > 
> > Cc: Eric Dong 
> > Cc: Ray Ni 
> > Cc: Laszlo Ersek 
> > Cc: Yao Jiewen 
> > ---
> >  UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c   | 22
> > ++
> >  UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c  |  9 +---
> > -
> >  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 16
> > 
> >  UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c| 28
> > 
> >  4 files changed, 71 insertions(+), 4 deletions(-)
> >
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> > index b734a1ea8c..3750332ca8 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
> > @@ -316,3 +316,25 @@ SetPageTableAttributes (
> >
> >return ;
> >  }
> > +
> > +/**
> > +  This function returns with no action for 32 bit.
> > +**/
> > +VOID
> > +SaveCr2 (
> > +  VOID
> > +  )
> > +{
> > +// Do Nothing
> > +}
> > +
> > +/**
> > +  This function returns with no action for 32 bit.
> > +**/
> > +VOID
> > +RestoreCr2 (
> > +  VOID
> > +  )
> > +{
> > +// Do Nothing
> > +}
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> > index 3b0b3b52ac..6a5736a3eb 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
> > @@ -1107,14 +1107,14 @@ SmiRendezvous (
> >BOOLEANIsBsp;
> >BOOLEANBspInProgress;
> >UINTN  Index;
> > -  UINTN  Cr2;
> >
> >ASSERT(CpuIndex < mMaxNumberOfCpus);
> >
> >//
> > -  // Save Cr2 because Page Fault exception in SMM may override its
> > value
> > +  // Save Cr2 because Page Fault exception in SMM may
> > override its value,
> > +  // when using on-demand paging for above 4G memory.
> >//
> > -  Cr2 = AsmReadCr2 ();
> > +  SaveCr2 ();
> >
> >//
> >// Perform CPU specific entry hooks @@ -1253,10 +1253,11 @@
> > SmiRendezvous (
> >
> >  Exit:
> >SmmCpuFeaturesRendezvousExit (CpuIndex);
> > +
> >//
> >// Restore Cr2
> >//
> > -  AsmWriteCr2 (Cr2);
> > +  RestoreCr2 ();
> >  }
> >
> >  /**
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> > index 84efb22981..71a8c13960 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> > @@ -1243,4 +1243,20 @@ EFIAPI
> >  PiSmmCpuSmiEntryFixupAddress (
> >   );
> >
> > +/**
> > +  This function saves CR2 register for 64 bit and no
> > action for 32 bit.
> > +**/
> > +VOID
> > +SaveCr2 (
> > +  VOID
> > +  );
> > +
> > +/**
> > +  This function restores CR2 register for 64 bit and no
> > action for 32 bit.
> > +**/
> > +VOID
> > +RestoreCr2 (
> > +  VOID
> > +  );
> > +
> >  #endif
> > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> > b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> > index 2c77cb47a4..76a30de171 100644
> > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
> > @@ -22,6 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
> KIND,
> > EITHER EXPRESS OR IMPLIED.
> >  LIST_ENTRY  mPagePool =
> > INITIALIZE_LIST_HEAD_VARIABLE (mPagePool);
> >  BOOLEAN m1GPageTableSupport
> > = FALSE;
> >  

[edk2] [PATCH v6] UefiCpuPkg\CpuSmm: Save & restore CR2 on-demand paging in SMM

[nkvangup]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1593

For every SMI occurrence, save and restore CR2 register only when SMM
on-demand paging support is enabled in 64 bit operation mode.
This is not a bug but to have better improvement of code.

Patch5 is updated with separate functions for Save and Restore of CR2
based on review feedback.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Vanguput Narendra K 
Cc: Eric Dong 
Cc: Ray Ni 
Cc: Laszlo Ersek 
Cc: Yao Jiewen 
---
 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c   | 26 ++
 UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c  |  9 ++---
 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 22 ++
 UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c| 30 ++
 4 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c 
b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
index b734a1ea8c..af96e42982 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
@@ -316,3 +316,29 @@ SetPageTableAttributes (
 
   return ;
 }
+
+/**
+  This function returns with no action for 32 bit.
+
+  @param[in]  *Cr2  Pointer to variable to hold CR2 register value
+**/
+VOID
+SaveCr2 (
+  UINTN  *Cr2
+  )
+{
+  return ;
+}
+
+/**
+  This function returns with no action for 32 bit.
+
+  @param[in]  Cr2  Value to write into CR2 register
+**/
+VOID
+RestoreCr2 (
+  UINTN  Cr2
+  )
+{
+  return ;
+}
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c 
b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
index 3b0b3b52ac..ce70f77709 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
@@ -1112,9 +1112,11 @@ SmiRendezvous (
   ASSERT(CpuIndex < mMaxNumberOfCpus);
 
   //
-  // Save Cr2 because Page Fault exception in SMM may override its value
+  // Save Cr2 because Page Fault exception in SMM may override its value,
+  // when using on-demand paging for above 4G memory.
   //
-  Cr2 = AsmReadCr2 ();
+  Cr2 = 0;
+  SaveCr2 ();
 
   //
   // Perform CPU specific entry hooks
@@ -1253,10 +1255,11 @@ SmiRendezvous (
 
 Exit:
   SmmCpuFeaturesRendezvousExit (CpuIndex);
+
   //
   // Restore Cr2
   //
-  AsmWriteCr2 (Cr2);
+  RestoreCr2 (Cr2);
 }
 
 /**
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h 
b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
index 84efb22981..c9d147c8a1 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
@@ -1243,4 +1243,26 @@ EFIAPI
 PiSmmCpuSmiEntryFixupAddress (
  );
 
+/**
+  This function reads CR2 register when on-demand paging is enabled
+  for 64 bit and no action for 32 bit.
+
+  @param[in]  *Cr2  Pointer to variable to hold CR2 register value
+**/
+VOID
+SaveCr2 (
+  UINTN  *Cr2
+  );
+
+/**
+  This function writes into CR2 register when on-demand paging is enabled
+  for 64 bit and no action for 32 bit.
+
+  @param[in]  Cr2  Value to write into CR2 register
+**/
+VOID
+RestoreCr2 (
+  UINTN  Cr2
+  );
+
 #endif
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c 
b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
index 2c77cb47a4..6cb44fbbe5 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
@@ -1053,3 +1053,33 @@ SetPageTableAttributes (
 
   return ;
 }
+
+/**
+  This function reads CR2 register when on-demand paging is enabled
+
+  @param[in]  *Cr2  Pointer to variable to hold CR2 register value
+**/
+VOID
+SaveCr2 (
+  UINTN  *Cr2
+  )
+{
+  if (!mCpuSmmStaticPageTable) {
+*Cr2 = AsmReadCr2 ();
+  }
+}
+
+/**
+  This function restores CR2 register when on-demand paging is enabled
+
+  @param[in]  Cr2  Value to write into CR2 register
+**/
+VOID
+RestoreCr2 (
+  UINTN  Cr2
+  )
+{
+  if ((!mCpuSmmStaticPageTable) && (Cr2 != 0)) {
+AsmWriteCr2 (Cr2);
+  }
+}
-- 
2.16.2.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH V5 14/17] MdeModulePkg: Add definitions for EDKII DEBUG PPI

[Gao, Zhichao]

B stand for BASE_LIST, we use B instead of V because of compatible issue.
For VA_LIST, it may be a pointer or a structure depend on the compiler.
If some PEIMs consume V version function and it is compiled by a different 
compiler, they may catch these issue.

Thanks,
Zhichao

> -Original Message-
> From: Ni, Ray
> Sent: Thursday, March 28, 2019 6:13 PM
> To: Gao, Zhichao ; edk2-devel@lists.01.org
> Cc: Wang, Jian J ; Wu, Hao A ;
> Zeng, Star ; Gao, Liming ;
> Sean Brogan ; Michael Turner
> ; Bret Barkelew
> 
> Subject: RE: [PATCH V5 14/17] MdeModulePkg: Add definitions for EDKII
> DEBUG PPI
> 
> Zhichao,
> I see you added library API called DebugVPrint. Why the interface in the PPI
> is called DebugBPrint?
> What does "B" stand for? Why invent a "B" but not use "V"?
> 
> > -Original Message-
> > From: Gao, Zhichao 
> > Sent: Thursday, March 28, 2019 4:10 PM
> > To: edk2-devel@lists.01.org
> > Cc: Wang, Jian J ; Wu, Hao A
> > ; Ni, Ray ; Zeng, Star
> > ; Gao, Liming ; Sean Brogan
> > ; Michael Turner
> > ; Bret Barkelew
> > 
> > Subject: [PATCH V5 14/17] MdeModulePkg: Add definitions for EDKII
> > DEBUG PPI
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1549
> >
> > Add a debug PPI for PEI phase. This PPI will provide basic services of 
> > debug.
> > PEI debug lib instance can use these services to implement debug
> > function to reduce the PEIMs which consume the debug lib.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Zhichao Gao 
> > Cc: Jian J Wang 
> > Cc: Hao Wu 
> > Cc: Ray Ni 
> > Cc: Star Zeng 
> > Cc: Liming Gao 
> > Cc: Sean Brogan 
> > Cc: Michael Turner 
> > Cc: Bret Barkelew 
> > Reviewed-by: Hao Wu 
> > ---
> >  MdeModulePkg/Include/Ppi/Debug.h | 82
> > 
> >  MdeModulePkg/MdeModulePkg.dec|  3 ++
> >  2 files changed, 85 insertions(+)
> >  create mode 100644 MdeModulePkg/Include/Ppi/Debug.h
> >
> > diff --git a/MdeModulePkg/Include/Ppi/Debug.h
> > b/MdeModulePkg/Include/Ppi/Debug.h
> > new file mode 100644
> > index 00..0fb6a8fdc2
> > --- /dev/null
> > +++ b/MdeModulePkg/Include/Ppi/Debug.h
> > @@ -0,0 +1,82 @@
> > +/** @file
> > +  Define the EDKII_DEBUG_PPI that PEIMs can use to dump info to debug
> > port.
> > +
> > +  Copyright (c) 2019, Intel Corporation. All rights reserved.
> > +
> > +  This program and the accompanying materials  are licensed and made
> > + available under the terms and conditions  of the BSD License which
> > + accompanies this distribution.  The  full text of the license may be
> > + found at  http://opensource.org/licenses/bsd-license.php
> > +
> > +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> > BASIS,
> > + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> > EXPRESS OR IMPLIED.
> > +
> > +**/
> > +
> > +#ifndef __EDKII_DEBUG_PPI_H__
> > +#define __EDKII_DEBUG_PPI_H__
> > +
> > +#include 
> > +
> > +//
> > +// Global ID for the EDKII_DEBUG_PPI
> > +//
> > +#define EDKII_DEBUG_PPI_GUID \
> > +  { \
> > +0x999e699c, 0xb013, 0x475e, {0xb1, 0x7b, 0xf3, 0xa8, 0xae, 0x5c,
> > +0x48, 0x75} \
> > +  }
> > +
> > +///
> > +/// Forward declaration for the PEI_DEBUG_LIB_DEBUG_PPI
> > EDKII_DEBUG_PPI
> > +/// typedef struct _EDKII_DEBUG_PPI EDKII_DEBUG_PPI;
> > +
> > +/**
> > +  Print a debug message to debug output device if the specified error
> > +level
> > +  is enabled.
> > +
> > +  @param[in] ErrorLevel   The error level of the debug message.
> > +  @param[in] Format   Format string for the debug message 
> > to
> print.
> > +  @param[in] Marker   BASE_LIST marker for the variable
> argument
> > list.
> > +
> > +**/
> > +typedef
> > +VOID
> > +(EFIAPI *EDKII_DEBUG_BPRINT)(
> > +  IN UINTN  ErrorLevel,
> > +  IN CONST CHAR8*Format,
> > +  IN BASE_LIST  Marker
> > +  );
> > +
> > +/**
> > +  Print an assert message containing a filename, line number, and
> > description.
> > +  This may be followed by a breakpoint or a dead loop.
> > +
> > +  @param[in] FileName The pointer to the name of the 
> > source file
> > that
> > +  generated the assert condition.
> > +  @param[in] LineNumber   The line number in the source file 
> > that
> > generated
> > +  the assert condition
> > +  @param[in] Description  The pointer to the description of the
> assert
> > condition.
> > +
> > +**/
> > +typedef
> > +VOID
> > +(EFIAPI *EDKII_DEBUG_ASSERT)(
> > +  IN CONST CHAR8*FileName,
> > +  IN UINTN  LineNumber,
> > +  IN CONST CHAR8*Description
> > +  );
> > +
> > +///
> > +/// This PPI contains a set of services to print message to debug
> > +output device /// struct _EDKII_DEBUG_PPI {
> > +  EDKII_DEBUG_BPRINTDebugBPrint;
> > +  EDKII_DEBUG_ASSERT   

Re: [edk2] [PATCH 3/4] ShellPkg/UefiHandleParsingLib: Remove some unused Guids

[Carsey, Jaben]

Reviewed-by: Jaben Carsey 

> -Original Message-
> From: Ni, Ray
> Sent: Thursday, March 28, 2019 6:50 PM
> To: Zhang, Shenglei ; edk2-devel@lists.01.org
> Cc: Carsey, Jaben 
> Subject: RE: [PATCH 3/4] ShellPkg/UefiHandleParsingLib: Remove some
> unused Guids
> Importance: High
> 
> Reviewed-by: Ray Ni 
> 
> > -Original Message-
> > From: Zhang, Shenglei
> > Sent: Friday, March 29, 2019 9:41 AM
> > To: edk2-devel@lists.01.org
> > Cc: Carsey, Jaben ; Ni, Ray 
> > Subject: [PATCH 3/4] ShellPkg/UefiHandleParsingLib: Remove some unused
> > Guids
> >
> > ExtendedSalBootService.h, ExtendedSalServiceClasses.h and McaInitPmi.h
> > will be deleted. So remove the Guids defined in these Protocols. And
> > also remove strings in uni file.
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1560
> >
> > Cc: Jaben Carsey 
> > Cc: Ray Ni 
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Shenglei Zhang 
> > ---
> >  .../UefiHandleParsingLib/UefiHandleParsingLib.c | 17 -
> >  .../UefiHandleParsingLib.inf| 17 -
> >  .../UefiHandleParsingLib.uni| 17 -
> >  3 files changed, 51 deletions(-)
> >
> > diff --git
> > a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > index 2d94a52108..a106c0906c 100644
> > --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > @@ -2321,23 +2321,6 @@ STATIC CONST GUID_INFO_BLOCK
> mGuidStringList[]
> > = {
> >{STRING_TOKEN(STR_FVB2),
> > ,NULL},
> >{STRING_TOKEN(STR_CPUIO2),,
> > NULL},
> >{STRING_TOKEN(STR_LEGACY_R2),
> ,
> > NULL},
> > -  {STRING_TOKEN(STR_SAL_MIP),   ,
> > NULL},
> > -  {STRING_TOKEN(STR_ES_BS),
> > ,  NULL},
> > -  {STRING_TOKEN(STR_ES_BIO),
> > ,   NULL},
> > -  {STRING_TOKEN(STR_ES_STALL),
> > ,NULL},
> > -  {STRING_TOKEN(STR_ES_RTC),
> > ,  NULL},
> > -  {STRING_TOKEN(STR_ES_VS),
> > , NULL},
> > -  {STRING_TOKEN(STR_ES_MTC),
> > ,  NULL},
> > -  {STRING_TOKEN(STR_ES_RESET),
> > ,NULL},
> > -  {STRING_TOKEN(STR_ES_SC),
> > ,   NULL},
> > -  {STRING_TOKEN(STR_ES_FBS),
> > ,  NULL},
> > -  {STRING_TOKEN(STR_ES_MP),
> > ,   NULL},
> > -  {STRING_TOKEN(STR_ES_PAL),
> > ,  NULL},
> > -  {STRING_TOKEN(STR_ES_BASE),
> > , NULL},
> > -  {STRING_TOKEN(STR_ES_MCA),
> > ,  NULL},
> > -  {STRING_TOKEN(STR_ES_PCI),
> > ,  NULL},
> > -  {STRING_TOKEN(STR_ES_CACHE),
> > ,NULL},
> > -  {STRING_TOKEN(STR_ES_MCA_LOG),
> > ,   NULL},
> >{STRING_TOKEN(STR_S2ARCH),,
> > NULL},
> >{STRING_TOKEN(STR_EODXE), ,
> > NULL},
> >{STRING_TOKEN(STR_ISAHC), ,
> > NULL},
> > diff --git
> > a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> > b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> > index a795fb92de..edab57f892 100644
> > --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> > +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> > @@ -234,23 +234,6 @@
> >gEfiFirmwareVolumeBlock2ProtocolGuid## UNDEFINED
> >gEfiCpuIo2ProtocolGuid  ## UNDEFINED
> >gEfiLegacyRegion2ProtocolGuid   ## UNDEFINED
> > -  gEfiSalMcaInitPmiProtocolGuid   ## UNDEFINED
> > -  gEfiExtendedSalBootServiceProtocolGuid  ## UNDEFINED
> > -  gEfiExtendedSalBaseIoServicesProtocolGuid   ## UNDEFINED
> > -  gEfiExtendedSalStallServicesProtocolGuid## UNDEFINED
> > -  gEfiExtendedSalRtcServicesProtocolGuid  ## UNDEFINED
> > -  gEfiExtendedSalVariableServicesProtocolGuid ## UNDEFINED
> > -  gEfiExtendedSalMtcServicesProtocolGuid  ## UNDEFINED
> > -  gEfiExtendedSalResetServicesProtocolGuid## UNDEFINED
> > -  gEfiExtendedSalStatusCodeServicesProtocolGuid   ## UNDEFINED
> > -  gEfiExtendedSalFvBlockServicesProtocolGuid  ## UNDEFINED
> > -  gEfiExtendedSalMpServicesProtocolGuid   ## UNDEFINED
> > -  gEfiExtendedSalPalServicesProtocolGuid  ## UNDEFINED
> > -  gEfiExtendedSalBaseServicesProtocolGuid ## UNDEFINED
> > -  gEfiExtendedSalMcaServicesProtocolGuid  ## UNDEFINED
> > -  gEfiExtendedSalPciServicesProtocolGuid  ## UNDEFINED
> > -  gEfiExtendedSalCacheServicesProtocolGuid## UNDEFINED
> > -  gEfiExtendedSalMcaLogServicesProtocolGuid   ## UNDEFINED
> >gEfiSecurity2ArchProtocolGuid   ## UNDEFINED
> >gEfiSmmEndOfDxeProtocolGuid ## UNDEFINED
> >gEfiIsaHcProtocolGuid   

Re: [edk2] [Patch][edk2-platforms/devel-MinnowBoardMax-UDK2017] Vlv2TbltDevicePkg: Change BIOS version.

[Qian, Yi]

Reviewed by Qian Yi

Thanks
Qian Yi

> -Original Message-
> From: Sun, Zailiang
> Sent: Thursday, March 28, 2019 8:42 PM
> To: edk2-devel@lists.01.org
> Cc: Wei, David ; Qian, Yi 
> Subject: [Patch][edk2-platforms/devel-MinnowBoardMax-UDK2017]
> Vlv2TbltDevicePkg: Change BIOS version.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zailiang Sun 
> Cc: David Wei 
> Cc: Yi Qian 
> ---
>  Vlv2TbltDevicePkg/BiosId.env | 2 +-
>  Vlv2TbltDevicePkg/BiosIdD.env| 2 +-
>  Vlv2TbltDevicePkg/BiosIdR.env| 2 +-
>  Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +-  Vlv2TbltDevicePkg/BiosIdx64R.env
> | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Vlv2TbltDevicePkg/BiosId.env b/Vlv2TbltDevicePkg/BiosId.env
> index dfdcb34f41..41206302a1 100644
> --- a/Vlv2TbltDevicePkg/BiosId.env
> +++ b/Vlv2TbltDevicePkg/BiosId.env
> @@ -24,6 +24,6 @@
>  BOARD_ID  = MNW2MAX
>  BOARD_REV = 1
>  BUILD_TYPE= D
> -VERSION_MAJOR = 0100
> +VERSION_MAJOR = 0101
>  VERSION_MINOR = 01
>  BOARD_EXT = X64
> diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env
> index e3bd0053b6..d09438b656 100644
> --- a/Vlv2TbltDevicePkg/BiosIdD.env
> +++ b/Vlv2TbltDevicePkg/BiosIdD.env
> @@ -35,5 +35,5 @@ OEM_ID= I32
>  BUILD_TYPE= D
> 
>  BOARD_ID = BLAKCRB
> -VERSION_MAJOR = 0100
> +VERSION_MAJOR = 0101
>  VERSION_MINOR = 01
> diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env
> index 4629c44d14..635f2cb662 100644
> --- a/Vlv2TbltDevicePkg/BiosIdR.env
> +++ b/Vlv2TbltDevicePkg/BiosIdR.env
> @@ -35,5 +35,5 @@ OEM_ID= I32
>  BUILD_TYPE= R
> 
>  BOARD_ID = BLAKCRB
> -VERSION_MAJOR = 0100
> +VERSION_MAJOR = 0101
>  VERSION_MINOR = 01
> diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env
> b/Vlv2TbltDevicePkg/BiosIdx64D.env
> index 902820b6c3..1c16b2de6c 100644
> --- a/Vlv2TbltDevicePkg/BiosIdx64D.env
> +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env
> @@ -25,6 +25,6 @@ BOARD_REV = 1
>  OEM_ID= X64
>  BUILD_TYPE= D
> 
> -VERSION_MAJOR = 0100
> +VERSION_MAJOR = 0101
>  VERSION_MINOR = 01
>  BOARD_ID = BBAYCRB
> diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env
> b/Vlv2TbltDevicePkg/BiosIdx64R.env
> index 7d06cf5bae..69d74c30c7 100644
> --- a/Vlv2TbltDevicePkg/BiosIdx64R.env
> +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env
> @@ -25,6 +25,6 @@ BOARD_REV = 1
>  OEM_ID= X64
>  BUILD_TYPE= R
> 
> -VERSION_MAJOR = 0100
> +VERSION_MAJOR = 0101
>  VERSION_MINOR = 01
>  BOARD_ID = BBAYCRB
> --
> 2.19.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH 00/10] Remove .S files for IA32 and X64 arch in MdePkg and UefiCpuPkg

[Gao, Liming]

Shenglei:
  There are still .S files in SourceLevelDebugPkg\Library\ and 
CryptoPkg\Library\IntrinsicLib directory. Please remove them.

  After remove them, please take 
https://bugzilla.tianocore.org/show_bug.cgi?id=881 to update nasm source code 
for XCODE optimization. 

Thanks
Liming
>-Original Message-
>From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
>Shenglei Zhang
>Sent: Thursday, March 07, 2019 10:30 AM
>To: edk2-devel@lists.01.org
>Cc: Kinney, Michael D ; Laszlo Ersek
>; Dong, Eric ; Gao, Liming
>
>Subject: [edk2] [PATCH 00/10] Remove .S files for IA32 and X64 arch in
>MdePkg and UefiCpuPkg
>
>.nasm file has been added for X86 arch. .S assembly code
>is not required any more.
>https://bugzilla.tianocore.org/show_bug.cgi?id=1594
>
>Cc: Michael D Kinney 
>Cc: Liming Gao 
>Cc: Eric Dong 
>Cc: Ray Ni 
>Cc: Laszlo Ersek 
>Shenglei Zhang (10):
>  UefiCpuPkg/SmmCpuFeaturesLib: Remove .S files for IA32 and X64 arch
>  UefiCpuPkg/BaseUefiCpuLib: Remove .S files for IA32 and X64 arch
>  UefiCpuPkg/CpuExceptionHandlerLib:Remove.S files for IA32 and X64 arch
>  MdePkg/BaseCpuLib: Remove .S files for IA32 and X64 arch
>  MdePkg/BaseLib: Remove .S files for IA32 and X64 arch
>  MdePkg/BaseMemoryLibMmx: Remove .S files for IA32 and X64 arch
>  MdePkg/BaseMemoryLibOptDxe: Remove .S files for IA32 and X64 arch
>  MdePkg/BaseMemoryLibOptPei: Remove .S files for IA32 and X64 arch
>  MdePkg/BaseMemoryLibRepStr: Remove .S files for IA32 and X64 arch
>  MdePkg/BaseMemoryLibSse2: Remove .S files for IA32 and X64 arch
>
> MdePkg/Library/BaseCpuLib/BaseCpuLib.inf  |   2 -
> MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.S   |  35 -
> MdePkg/Library/BaseCpuLib/X64/CpuSleep.S  |  34 -
> MdePkg/Library/BaseLib/BaseLib.inf|  38 -
> MdePkg/Library/BaseLib/Ia32/ARShiftU64.S  |  43 --
> MdePkg/Library/BaseLib/Ia32/CpuId.S   |  63 --
> MdePkg/Library/BaseLib/Ia32/CpuIdEx.S |  67 --
> MdePkg/Library/BaseLib/Ia32/DisableCache.S|  39 -
> MdePkg/Library/BaseLib/Ia32/DisablePaging32.S |  52 --
> MdePkg/Library/BaseLib/Ia32/DivU64x32.S   |  41 --
> .../Library/BaseLib/Ia32/DivU64x32Remainder.S |  46 --
> .../Library/BaseLib/Ia32/DivU64x64Remainder.S |  89 ---
> MdePkg/Library/BaseLib/Ia32/EnableCache.S |  39 -
> .../BaseLib/Ia32/EnableDisableInterrupts.S|  36 -
> MdePkg/Library/BaseLib/Ia32/EnablePaging32.S  |  52 --
> MdePkg/Library/BaseLib/Ia32/EnablePaging64.S  |  63 --
> .../BaseLib/Ia32/InternalSwitchStack.S|  48 --
> MdePkg/Library/BaseLib/Ia32/LRotU64.S |  48 --
> MdePkg/Library/BaseLib/Ia32/LShiftU64.S   |  43 --
> MdePkg/Library/BaseLib/Ia32/LongJump.S|  41 --
> MdePkg/Library/BaseLib/Ia32/ModU64x32.S   |  40 --
> MdePkg/Library/BaseLib/Ia32/Monitor.S |  40 --
> MdePkg/Library/BaseLib/Ia32/MultU64x32.S  |  41 --
> MdePkg/Library/BaseLib/Ia32/MultU64x64.S  |  44 --
> MdePkg/Library/BaseLib/Ia32/Mwait.S   |  38 -
> MdePkg/Library/BaseLib/Ia32/RRotU64.S |  48 --
> MdePkg/Library/BaseLib/Ia32/RShiftU64.S   |  46 --
> MdePkg/Library/BaseLib/Ia32/RdRand.S  |  80 ---
> MdePkg/Library/BaseLib/Ia32/SetJump.S |  44 --
> MdePkg/Library/BaseLib/Ia32/SwapBytes64.S |  38 -
> MdePkg/Library/BaseLib/Ia32/Thunk16.S | 222 --
> MdePkg/Library/BaseLib/X64/CpuId.S|  60 --
> MdePkg/Library/BaseLib/X64/CpuIdEx.S  |  62 --
> MdePkg/Library/BaseLib/X64/DisableCache.S |  39 -
> MdePkg/Library/BaseLib/X64/DisablePaging64.S  |  82 ---
> MdePkg/Library/BaseLib/X64/EnableCache.S  |  39 -
> .../BaseLib/X64/EnableDisableInterrupts.S |  36 -
> MdePkg/Library/BaseLib/X64/LongJump.S |  54 --
> MdePkg/Library/BaseLib/X64/RdRand.S   |  72 --
> MdePkg/Library/BaseLib/X64/SetJump.S  |  53 --
> MdePkg/Library/BaseLib/X64/SwitchStack.S  |  52 --
> MdePkg/Library/BaseLib/X64/Thunk16.S  | 334 -
> .../BaseMemoryLibMmx/BaseMemoryLibMmx.inf |  22 -
> .../BaseMemoryLibMmx/Ia32/CompareMem.S|  55 --
> .../Library/BaseMemoryLibMmx/Ia32/CopyMem.S   |  86 ---
> .../Library/BaseMemoryLibMmx/Ia32/ScanMem16.S |  52 --
> .../Library/BaseMemoryLibMmx/Ia32/ScanMem32.S |  52 --
> .../Library/BaseMemoryLibMmx/Ia32/ScanMem64.S |  61 --
> .../Library/BaseMemoryLibMmx/Ia32/ScanMem8.S  |  52 --
> MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S |  66 --
> .../Library/BaseMemoryLibMmx/Ia32/SetMem16.S  |  59 --
> .../Library/BaseMemoryLibMmx/Ia32/SetMem32.S  |  52 --
> .../Library/BaseMemoryLibMmx/Ia32/SetMem64.S  |  43 --
> .../Library/BaseMemoryLibMmx/Ia32/ZeroMem.S   |  54 --
> .../Library/BaseMemoryLibMmx/X64/CompareMem.S |  59 --
> MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S |  74 --
> .../Library/BaseMemoryLibMmx/X64/ScanMem16.S  |  56 --
> .../Library/BaseMemoryLibMmx/X64/ScanMem32.S  |  56 --
> .../Library/BaseMemoryLibMmx/X64/ScanMem64.S  |  55 --
> .../Library/BaseMemoryLibMmx/X64/ScanMem8.S   |  56 --
> 

Re: [edk2] [PATCH 3/4] ShellPkg/UefiHandleParsingLib: Remove some unused Guids

[Ni, Ray]

Reviewed-by: Ray Ni 

> -Original Message-
> From: Zhang, Shenglei
> Sent: Friday, March 29, 2019 9:41 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben ; Ni, Ray 
> Subject: [PATCH 3/4] ShellPkg/UefiHandleParsingLib: Remove some unused
> Guids
> 
> ExtendedSalBootService.h, ExtendedSalServiceClasses.h and McaInitPmi.h will
> be deleted. So remove the Guids defined in these Protocols. And also remove
> strings in uni file.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1560
> 
> Cc: Jaben Carsey 
> Cc: Ray Ni 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang 
> ---
>  .../UefiHandleParsingLib/UefiHandleParsingLib.c | 17 -
>  .../UefiHandleParsingLib.inf| 17 -
>  .../UefiHandleParsingLib.uni| 17 -
>  3 files changed, 51 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> index 2d94a52108..a106c0906c 100644
> --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> @@ -2321,23 +2321,6 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[]
> = {
>{STRING_TOKEN(STR_FVB2),
> ,NULL},
>{STRING_TOKEN(STR_CPUIO2),,
> NULL},
>{STRING_TOKEN(STR_LEGACY_R2), ,
> NULL},
> -  {STRING_TOKEN(STR_SAL_MIP),   ,
> NULL},
> -  {STRING_TOKEN(STR_ES_BS),
> ,  NULL},
> -  {STRING_TOKEN(STR_ES_BIO),
> ,   NULL},
> -  {STRING_TOKEN(STR_ES_STALL),
> ,NULL},
> -  {STRING_TOKEN(STR_ES_RTC),
> ,  NULL},
> -  {STRING_TOKEN(STR_ES_VS),
> , NULL},
> -  {STRING_TOKEN(STR_ES_MTC),
> ,  NULL},
> -  {STRING_TOKEN(STR_ES_RESET),
> ,NULL},
> -  {STRING_TOKEN(STR_ES_SC),
> ,   NULL},
> -  {STRING_TOKEN(STR_ES_FBS),
> ,  NULL},
> -  {STRING_TOKEN(STR_ES_MP),
> ,   NULL},
> -  {STRING_TOKEN(STR_ES_PAL),
> ,  NULL},
> -  {STRING_TOKEN(STR_ES_BASE),
> , NULL},
> -  {STRING_TOKEN(STR_ES_MCA),
> ,  NULL},
> -  {STRING_TOKEN(STR_ES_PCI),
> ,  NULL},
> -  {STRING_TOKEN(STR_ES_CACHE),
> ,NULL},
> -  {STRING_TOKEN(STR_ES_MCA_LOG),
> ,   NULL},
>{STRING_TOKEN(STR_S2ARCH),,
> NULL},
>{STRING_TOKEN(STR_EODXE), ,
> NULL},
>{STRING_TOKEN(STR_ISAHC), ,
> NULL},
> diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> index a795fb92de..edab57f892 100644
> --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> @@ -234,23 +234,6 @@
>gEfiFirmwareVolumeBlock2ProtocolGuid## UNDEFINED
>gEfiCpuIo2ProtocolGuid  ## UNDEFINED
>gEfiLegacyRegion2ProtocolGuid   ## UNDEFINED
> -  gEfiSalMcaInitPmiProtocolGuid   ## UNDEFINED
> -  gEfiExtendedSalBootServiceProtocolGuid  ## UNDEFINED
> -  gEfiExtendedSalBaseIoServicesProtocolGuid   ## UNDEFINED
> -  gEfiExtendedSalStallServicesProtocolGuid## UNDEFINED
> -  gEfiExtendedSalRtcServicesProtocolGuid  ## UNDEFINED
> -  gEfiExtendedSalVariableServicesProtocolGuid ## UNDEFINED
> -  gEfiExtendedSalMtcServicesProtocolGuid  ## UNDEFINED
> -  gEfiExtendedSalResetServicesProtocolGuid## UNDEFINED
> -  gEfiExtendedSalStatusCodeServicesProtocolGuid   ## UNDEFINED
> -  gEfiExtendedSalFvBlockServicesProtocolGuid  ## UNDEFINED
> -  gEfiExtendedSalMpServicesProtocolGuid   ## UNDEFINED
> -  gEfiExtendedSalPalServicesProtocolGuid  ## UNDEFINED
> -  gEfiExtendedSalBaseServicesProtocolGuid ## UNDEFINED
> -  gEfiExtendedSalMcaServicesProtocolGuid  ## UNDEFINED
> -  gEfiExtendedSalPciServicesProtocolGuid  ## UNDEFINED
> -  gEfiExtendedSalCacheServicesProtocolGuid## UNDEFINED
> -  gEfiExtendedSalMcaLogServicesProtocolGuid   ## UNDEFINED
>gEfiSecurity2ArchProtocolGuid   ## UNDEFINED
>gEfiSmmEndOfDxeProtocolGuid ## UNDEFINED
>gEfiIsaHcProtocolGuid   ## UNDEFINED
> diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
> b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
> index 15f3912045..3238441b1e 100644
> --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
> +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
> @@ -274,23 +274,6 @@
>  #string STR_FVB2  #language en-US "FirmwareVolumeBlock2"
>  #string STR_CPUIO2   

Re: [edk2] [PATCH 2/4] ShellPkg/UefiShellDebug1CommandsLib

[Carsey, Jaben]

Reviewed-by: Jaben Carsey 

> -Original Message-
> From: Ni, Ray
> Sent: Thursday, March 28, 2019 6:50 PM
> To: Zhang, Shenglei ; edk2-devel@lists.01.org
> Cc: Carsey, Jaben 
> Subject: RE: [PATCH 2/4] ShellPkg/UefiShellDebug1CommandsLib
> Importance: High
> 
> Reviewed-by: Ray Ni 
> 
> > -Original Message-
> > From: Zhang, Shenglei
> > Sent: Friday, March 29, 2019 9:41 AM
> > To: edk2-devel@lists.01.org
> > Cc: Carsey, Jaben ; Ni, Ray 
> > Subject: [PATCH 2/4] ShellPkg/UefiShellDebug1CommandsLib
> >
> > With Itanium architecture unsupported, gEfiSalSystemTableGuid and
> > gEfiMpsTableGuid will be no longer used.
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1560
> >
> > Cc: Jaben Carsey 
> > Cc: Ray Ni 
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Shenglei Zhang 
> > ---
> >  ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 10 --
> >  .../UefiShellDebug1CommandsLib.inf |  2 --
> >  2 files changed, 12 deletions(-)
> >
> > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> > b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> > index a4c18c9b68..023806742d 100644
> > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> > @@ -17,9 +17,7 @@
> >  #include "UefiShellDebug1CommandsLib.h"
> >  #include   #include 
> > -#include   #include  -#include
> > 
> >
> >  /**
> >Make a printable character.
> > @@ -186,10 +184,6 @@ ShellCommandRunDmem (
> >AcpiTableAddress = (UINT64)(UINTN)gST-
> > >ConfigurationTable[TableWalker].VendorTable;
> >continue;
> >  }
> > -if (CompareGuid(
> >ConfigurationTable[TableWalker].VendorGuid,
> > )) {
> > -  SalTableAddress = (UINT64)(UINTN)gST-
> > >ConfigurationTable[TableWalker].VendorTable;
> > -  continue;
> > -}
> >  if
> > (CompareGuid(>ConfigurationTable[TableWalker].VendorGuid,
> > )) {
> >SmbiosTableAddress = (UINT64)(UINTN)gST-
> > >ConfigurationTable[TableWalker].VendorTable;
> >continue;
> > @@ -198,10 +192,6 @@ ShellCommandRunDmem (
> >SmbiosTableAddress = (UINT64) (UINTN) gST-
> > >ConfigurationTable[TableWalker].VendorTable;
> >continue;
> >  }
> > -if (CompareGuid(
> >ConfigurationTable[TableWalker].VendorGuid,
> > )) {
> > -  MpsTableAddress = (UINT64)(UINTN)gST-
> > >ConfigurationTable[TableWalker].VendorTable;
> > -  continue;
> > -}
> >}
> >
> >ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN
> > (STR_DMEM_SYSTEM_TABLE), gShellDebug1HiiHandle, diff --git
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsL
> > i
> > b.inf
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsL
> > i
> > b.inf
> > index ec1f87ae19..f2666b7ff9 100644
> > ---
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsL
> > i
> > b.inf
> > +++
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> d
> > +++ sLib.inf
> > @@ -130,8 +130,6 @@
> >gEfiGlobalVariableGuid  ## SOMETIMES_CONSUMES ## GUID
> >gEfiSmbiosTableGuid ## SOMETIMES_CONSUMES ## SystemTable
> >gEfiSmbios3TableGuid## SOMETIMES_CONSUMES ## SystemTable
> > -  gEfiMpsTableGuid## SOMETIMES_CONSUMES ## SystemTable
> > -  gEfiSalSystemTableGuid  ## SOMETIMES_CONSUMES ## SystemTable
> >gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## SystemTable
> >gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## SystemTable
> >gShellDebug1HiiGuid ## SOMETIMES_CONSUMES ## HII
> > --
> > 2.18.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH 2/4] ShellPkg/UefiShellDebug1CommandsLib

[Ni, Ray]

Reviewed-by: Ray Ni 

> -Original Message-
> From: Zhang, Shenglei
> Sent: Friday, March 29, 2019 9:41 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben ; Ni, Ray 
> Subject: [PATCH 2/4] ShellPkg/UefiShellDebug1CommandsLib
> 
> With Itanium architecture unsupported, gEfiSalSystemTableGuid and
> gEfiMpsTableGuid will be no longer used.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1560
> 
> Cc: Jaben Carsey 
> Cc: Ray Ni 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang 
> ---
>  ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 10 --
>  .../UefiShellDebug1CommandsLib.inf |  2 --
>  2 files changed, 12 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> index a4c18c9b68..023806742d 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
> @@ -17,9 +17,7 @@
>  #include "UefiShellDebug1CommandsLib.h"
>  #include 
>  #include 
> -#include 
>  #include 
> -#include 
> 
>  /**
>Make a printable character.
> @@ -186,10 +184,6 @@ ShellCommandRunDmem (
>AcpiTableAddress = (UINT64)(UINTN)gST-
> >ConfigurationTable[TableWalker].VendorTable;
>continue;
>  }
> -if (CompareGuid(>ConfigurationTable[TableWalker].VendorGuid,
> )) {
> -  SalTableAddress = (UINT64)(UINTN)gST-
> >ConfigurationTable[TableWalker].VendorTable;
> -  continue;
> -}
>  if (CompareGuid(>ConfigurationTable[TableWalker].VendorGuid,
> )) {
>SmbiosTableAddress = (UINT64)(UINTN)gST-
> >ConfigurationTable[TableWalker].VendorTable;
>continue;
> @@ -198,10 +192,6 @@ ShellCommandRunDmem (
>SmbiosTableAddress = (UINT64) (UINTN) gST-
> >ConfigurationTable[TableWalker].VendorTable;
>continue;
>  }
> -if (CompareGuid(>ConfigurationTable[TableWalker].VendorGuid,
> )) {
> -  MpsTableAddress = (UINT64)(UINTN)gST-
> >ConfigurationTable[TableWalker].VendorTable;
> -  continue;
> -}
>}
> 
>ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_SYSTEM_TABLE),
> gShellDebug1HiiHandle, diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi
> b.inf
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi
> b.inf
> index ec1f87ae19..f2666b7ff9 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi
> b.inf
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Command
> +++ sLib.inf
> @@ -130,8 +130,6 @@
>gEfiGlobalVariableGuid  ## SOMETIMES_CONSUMES ## GUID
>gEfiSmbiosTableGuid ## SOMETIMES_CONSUMES ## SystemTable
>gEfiSmbios3TableGuid## SOMETIMES_CONSUMES ## SystemTable
> -  gEfiMpsTableGuid## SOMETIMES_CONSUMES ## SystemTable
> -  gEfiSalSystemTableGuid  ## SOMETIMES_CONSUMES ## SystemTable
>gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## SystemTable
>gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## SystemTable
>gShellDebug1HiiGuid ## SOMETIMES_CONSUMES ## HII
> --
> 2.18.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 1/4] OvmfPkg/PlatformBootManagerLib: Remove dependency on Mps.h

[Shenglei Zhang]

Mps.h is included in BdsPlatform.h but not actually used.
So remove it.

Cc: Jordan Justen 
Cc: Laszlo Ersek 
Cc: Ard Biesheuvel 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h 
b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
index 4948ca6518..d6dfe1e697 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
@@ -63,7 +63,6 @@ Abstract:
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
-- 
2.18.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 0/4] Remove IPF and related code

[Shenglei Zhang]

Itanium arch is not supported any longer. So remove IPF and
related code.
https://bugzilla.tianocore.org/show_bug.cgi?id=1560

Cc: Jaben Carsey 
Cc: Ray Ni 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Jordan Justen 
Cc: Laszlo Ersek 
Cc: Ard Biesheuvel 
Shenglei Zhang (4):
  OvmfPkg/PlatformBootManagerLib: Remove dependency on Mps.h
  ShellPkg/UefiShellDebug1CommandsLib
  ShellPkg/UefiHandleParsingLib: Remove some unused Guids
  MdePkg: Removed IPF related code

 MdePkg/Include/Guid/Mps.h |   35 -
 MdePkg/Include/Guid/SalSystemTable.h  |   31 -
 MdePkg/Include/IndustryStandard/Pal.h | 3302 -
 MdePkg/Include/IndustryStandard/Sal.h |  915 -
 MdePkg/Include/Library/ExtendedSalLib.h   |  494 ---
 MdePkg/Include/Library/PalLib.h   |   63 -
 MdePkg/Include/Library/SalLib.h   |   59 -
 .../Include/Protocol/ExtendedSalBootService.h |  217 --
 .../Protocol/ExtendedSalServiceClasses.h  |  278 --
 MdePkg/Include/Protocol/McaInitPmi.h  |  207 --
 MdePkg/MdePkg.dec |   29 -
 .../PlatformBootManagerLib/BdsPlatform.h  |1 -
 .../UefiHandleParsingLib.c|   17 -
 .../UefiHandleParsingLib.inf  |   17 -
 .../Library/UefiShellDebug1CommandsLib/Dmem.c |   10 -
 .../UefiShellDebug1CommandsLib.inf|2 -
 16 files changed, 5677 deletions(-)
 delete mode 100644 MdePkg/Include/Guid/Mps.h
 delete mode 100644 MdePkg/Include/Guid/SalSystemTable.h
 delete mode 100644 MdePkg/Include/IndustryStandard/Pal.h
 delete mode 100644 MdePkg/Include/IndustryStandard/Sal.h
 delete mode 100644 MdePkg/Include/Library/ExtendedSalLib.h
 delete mode 100644 MdePkg/Include/Library/PalLib.h
 delete mode 100644 MdePkg/Include/Library/SalLib.h
 delete mode 100644 MdePkg/Include/Protocol/ExtendedSalBootService.h
 delete mode 100644 MdePkg/Include/Protocol/ExtendedSalServiceClasses.h
 delete mode 100644 MdePkg/Include/Protocol/McaInitPmi.h

-- 
2.18.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 2/4] ShellPkg/UefiShellDebug1CommandsLib

[Shenglei Zhang]

With Itanium architecture unsupported, gEfiSalSystemTableGuid
and gEfiMpsTableGuid will be no longer used.
https://bugzilla.tianocore.org/show_bug.cgi?id=1560

Cc: Jaben Carsey 
Cc: Ray Ni 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 10 --
 .../UefiShellDebug1CommandsLib.inf |  2 --
 2 files changed, 12 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c 
b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
index a4c18c9b68..023806742d 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
@@ -17,9 +17,7 @@
 #include "UefiShellDebug1CommandsLib.h"
 #include 
 #include 
-#include 
 #include 
-#include 
 
 /**
   Make a printable character.
@@ -186,10 +184,6 @@ ShellCommandRunDmem (
   AcpiTableAddress = 
(UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
   continue;
 }
-if (CompareGuid(>ConfigurationTable[TableWalker].VendorGuid, 
)) {
-  SalTableAddress = 
(UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
-  continue;
-}
 if (CompareGuid(>ConfigurationTable[TableWalker].VendorGuid, 
)) {
   SmbiosTableAddress = 
(UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
   continue;
@@ -198,10 +192,6 @@ ShellCommandRunDmem (
   SmbiosTableAddress = (UINT64) (UINTN) 
gST->ConfigurationTable[TableWalker].VendorTable;
   continue;
 }
-if (CompareGuid(>ConfigurationTable[TableWalker].VendorGuid, 
)) {
-  MpsTableAddress = 
(UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
-  continue;
-}
   }
 
   ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_SYSTEM_TABLE), 
gShellDebug1HiiHandle,
diff --git 
a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf 
b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index ec1f87ae19..f2666b7ff9 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -130,8 +130,6 @@
   gEfiGlobalVariableGuid  ## SOMETIMES_CONSUMES ## GUID
   gEfiSmbiosTableGuid ## SOMETIMES_CONSUMES ## SystemTable
   gEfiSmbios3TableGuid## SOMETIMES_CONSUMES ## SystemTable
-  gEfiMpsTableGuid## SOMETIMES_CONSUMES ## SystemTable
-  gEfiSalSystemTableGuid  ## SOMETIMES_CONSUMES ## SystemTable
   gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## SystemTable
   gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## SystemTable
   gShellDebug1HiiGuid ## SOMETIMES_CONSUMES ## HII
-- 
2.18.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 3/4] ShellPkg/UefiHandleParsingLib: Remove some unused Guids

[Shenglei Zhang]

ExtendedSalBootService.h, ExtendedSalServiceClasses.h and
McaInitPmi.h will be deleted. So remove the Guids defined
in these Protocols. And also remove strings in uni file.
https://bugzilla.tianocore.org/show_bug.cgi?id=1560

Cc: Jaben Carsey 
Cc: Ray Ni 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 .../UefiHandleParsingLib/UefiHandleParsingLib.c | 17 -
 .../UefiHandleParsingLib.inf| 17 -
 .../UefiHandleParsingLib.uni| 17 -
 3 files changed, 51 deletions(-)

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c 
b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 2d94a52108..a106c0906c 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -2321,23 +2321,6 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_FVB2),  
,NULL},
   {STRING_TOKEN(STR_CPUIO2),,   
   NULL},
   {STRING_TOKEN(STR_LEGACY_R2), ,
   NULL},
-  {STRING_TOKEN(STR_SAL_MIP),   ,
   NULL},
-  {STRING_TOKEN(STR_ES_BS), 
,  NULL},
-  {STRING_TOKEN(STR_ES_BIO),
,   NULL},
-  {STRING_TOKEN(STR_ES_STALL),  
,NULL},
-  {STRING_TOKEN(STR_ES_RTC),
,  NULL},
-  {STRING_TOKEN(STR_ES_VS), 
, NULL},
-  {STRING_TOKEN(STR_ES_MTC),
,  NULL},
-  {STRING_TOKEN(STR_ES_RESET),  
,NULL},
-  {STRING_TOKEN(STR_ES_SC), 
,   NULL},
-  {STRING_TOKEN(STR_ES_FBS),
,  NULL},
-  {STRING_TOKEN(STR_ES_MP), 
,   NULL},
-  {STRING_TOKEN(STR_ES_PAL),
,  NULL},
-  {STRING_TOKEN(STR_ES_BASE),   
, NULL},
-  {STRING_TOKEN(STR_ES_MCA),
,  NULL},
-  {STRING_TOKEN(STR_ES_PCI),
,  NULL},
-  {STRING_TOKEN(STR_ES_CACHE),  
,NULL},
-  {STRING_TOKEN(STR_ES_MCA_LOG),
,   NULL},
   {STRING_TOKEN(STR_S2ARCH),,
   NULL},
   {STRING_TOKEN(STR_EODXE), ,  
   NULL},
   {STRING_TOKEN(STR_ISAHC), ,
   NULL},
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf 
b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index a795fb92de..edab57f892 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -234,23 +234,6 @@
   gEfiFirmwareVolumeBlock2ProtocolGuid## UNDEFINED
   gEfiCpuIo2ProtocolGuid  ## UNDEFINED
   gEfiLegacyRegion2ProtocolGuid   ## UNDEFINED
-  gEfiSalMcaInitPmiProtocolGuid   ## UNDEFINED
-  gEfiExtendedSalBootServiceProtocolGuid  ## UNDEFINED
-  gEfiExtendedSalBaseIoServicesProtocolGuid   ## UNDEFINED
-  gEfiExtendedSalStallServicesProtocolGuid## UNDEFINED
-  gEfiExtendedSalRtcServicesProtocolGuid  ## UNDEFINED
-  gEfiExtendedSalVariableServicesProtocolGuid ## UNDEFINED
-  gEfiExtendedSalMtcServicesProtocolGuid  ## UNDEFINED
-  gEfiExtendedSalResetServicesProtocolGuid## UNDEFINED
-  gEfiExtendedSalStatusCodeServicesProtocolGuid   ## UNDEFINED
-  gEfiExtendedSalFvBlockServicesProtocolGuid  ## UNDEFINED
-  gEfiExtendedSalMpServicesProtocolGuid   ## UNDEFINED
-  gEfiExtendedSalPalServicesProtocolGuid  ## UNDEFINED
-  gEfiExtendedSalBaseServicesProtocolGuid ## UNDEFINED
-  gEfiExtendedSalMcaServicesProtocolGuid  ## UNDEFINED
-  gEfiExtendedSalPciServicesProtocolGuid  ## UNDEFINED
-  gEfiExtendedSalCacheServicesProtocolGuid## UNDEFINED
-  gEfiExtendedSalMcaLogServicesProtocolGuid   ## UNDEFINED
   gEfiSecurity2ArchProtocolGuid   ## UNDEFINED
   gEfiSmmEndOfDxeProtocolGuid ## UNDEFINED
   gEfiIsaHcProtocolGuid   ## UNDEFINED
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni 
b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
index 15f3912045..3238441b1e 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
@@ -274,23 +274,6 @@
 #string STR_FVB2  #language en-US "FirmwareVolumeBlock2"
 #string STR_CPUIO2#language en-US "CpuIo2"
 #string STR_LEGACY_R2 

[edk2] [edk2-test][PATCH v1 30/30] UEFI/UEFI.dec: Add missing protocol GUIDs in declaration file.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 uefi-sct/SctPkg/UEFI/UEFI.dec | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/uefi-sct/SctPkg/UEFI/UEFI.dec b/uefi-sct/SctPkg/UEFI/UEFI.dec
index 8495a4e1..bdf3323f 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI.dec
+++ b/uefi-sct/SctPkg/UEFI/UEFI.dec
@@ -1,7 +1,7 @@
 ## @file
 #
 #  Copyright 2004 - 2017 Unified EFI, Inc.
-#  Copyright (c) 2014 - 2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2014 - 2019, ARM Limited. All rights reserved.
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
 #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP
 #
@@ -119,14 +119,22 @@
   gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 
0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}
   gBlackBoxEfiHIIImageProtocolGuid = { 0x31a6406a, 0x6bdf, 0x4e46, {0xb2, 
0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 }}
   gBlackBoxEfiHIIImageExProtocolGuid = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 
0xe, 0xe8, 0xef,0x39, 0xe0, 0x65, 0x46 }}
+  gBlackBoxEfiHIIDatabaseProtocolGuid = { 0xef9fc172, 0xa1b2, 0x4693, { 0xb3, 
0x27, 0x6d, 0x32, 0xfc, 0x41, 0x60, 0x42 }}
+  gBlackBoxEfiHIIPackageListProtocolGuid = { 0x6a1ee763, 0xd47a, 0x43b4, { 
0xaa, 0xbe, 0xef, 0x1d, 0xe2, 0xab, 0x56, 0xfc }}
+  gBlackBoxEfiHIIStringProtocolGuid = {0xfd96974, 0x23aa, 0x4cdc, { 0xb9, 
0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a }}
+  gBlackBoxEfiHIIConfigAccessProtocolGuid = { 0x330d4706, 0xf2a0, 0x4e4f, { 
0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85 }}
+  gBlackBoxEfiHIIConfigRoutingProtocolGuid = { 0x587e72d7, 0xcc50, 0x4f79, { 
0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f }}
   gBlackBoxEfiHIIFontProtocolGuid = { 0xe9ca4775, 0x8657, 0x47fc, { 0x97, 
0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24 }}
   gBlackBoxEfiHIIFontExProtocolGuid = { 0x849e6875, 0xdb35, 0x4df8, { 0xb4, 
0x1e, 0xc8, 0xf3, 0x37, 0x18, 0x7, 0x3f }}
   gBlackBoxEfiHttpProtocolGuid = { 0x7A59B29B, 0x910B, 0x4171, { 0x82, 0x42, 
0xA8, 0x5A, 0x0D, 0xF2, 0x5B, 0x5B }}
   gBlackBoxEfiHttpServiceBindingProtocolGuid = { 0xbdc8e6af, 0xd9bc, 0x4379, { 
0xa7, 0x2a, 0xe0, 0xc4, 0xe7, 0x5d, 0xae, 0x1c }}
   gBlackBoxEfiIp4ServiceBindingProtocolGuid = { 0xc51711e7, 0xb4bf, 0x404a, 
{0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4 } }
   gBlackBoxEfiIp4ProtocolGuid = { 0x41d94cd2, 0x35b6, 0x455a, {0x82, 0x58, 
0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd } }
+  gBlackBoxEfiIp4ConfigProtocolGuid = { 0x3B95AA31, 0x3793, 0x434B, {0x86, 
0x67, 0xC8, 0x07, 0x08, 0x92, 0xE0, 0x5E } }
+  gBlackBoxEfiIp4Config2ProtocolGuid = { 0x5b446ed1, 0xe30b, 0x4faa, {0x87, 
0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } }
   gBlackBoxEfiIp6ServiceBindingProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, 
{0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
   gBlackBoxEfiIp6ProtocolGuid = { 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 
0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } }
+  gBlackBoxEfiIp6ConfigProtocolGuid = { 0x937fe521, 0x95ae, 0x4d1a, {0x89, 
0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } }
   gBlackBoxEfiIPsec2ProtocolGuid = {0xa3979e64, 0xace8, 0x4ddc, { 0xbc, 0x7, 
0x4d, 0x66, 0xb8, 0xfd, 0x9, 0x77 }}
   gBlackBoxEfiIPsecConfigProtocolGuid = { 0xce5e5929, 0xc7a3, 0x4602, { 0xad, 
0x9e, 0xc9, 0xda, 0xf9, 0x4e, 0xbf, 0xcf }}
   gBlackBoxEfiIScsiInitiatorNameProtocolGuid = { 0x59324945, 0xec44, 0x4c0d, 
{0xb1, 0xcd, 0x9d, 0xb1, 0x39, 0xdf, 0x7, 0xc }}
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 29/30] EFI/Protocol: Fix inf file for SimpleFileSystem protocol test.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/SimpleFileSystemBBTest.inf   | 29 +++
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf
index 608634e8..0f536e8c 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2013 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= SimpleFileSystemBBTest
 FILE_GUID= 39E91E5F-B218-4f80-ADDC-37C0003C5326
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeBBTestSimpleFileSystem
 
 [sources.common]
   Guid.c
@@ -42,19 +47,19 @@ COMPONENT_TYPE   = BS_DRIVER
   SimpleFileSystemExBBTestFunction_FlushEx.c
   SimpleFileSystemExBBTestFunction_OpenEx.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT=InitializeBBTestSimpleFileSystem
+[Guids]
+  gBlackBoxEfiFileInfoGuid
+  gBlackBoxEfiFileSystemInfoGuid
+  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid
+
+[Protocols]
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 28/30] EFI/Protocol: Fix inf file for PxeBase dependency data.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf   | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf
index e53151df..6cda9e62 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/Dependency/Config/Config.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,6 +29,7 @@
 BASE_NAME= PxeBaseCode_PxeBaseCodeBbTest
 FILE_GUID= C0A87EC1-FEFD-41d0-8A52-5F3B74B60FAF
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 27/30] EFI/Protocol: Fix inf file for LoadedImage protocol test.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/LoadedImageBBTest.inf| 27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
index 66704ef6..a97acfe2 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,29 +26,29 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= LoadedImageBBTest
 FILE_GUID= 23714078-BF1D-404e-A965-DED3D4952FE4
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeBBTestLoadedImageProtocol
 
 [sources.common]
   Guid.c
   LoadedImageBBTestMain.c
   LoadedImageBBTestProtocolDefinition.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/SctPkg/Include/Legacy
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT=InitializeBBTestLoadedImageProtocol
+[Protocols]
+  gEfiTestProfileLibraryGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 26/30] EFI/Protocol: Fix inf files for Pci protocol related dependency data.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf   | 3 ++-
 .../PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf
index 8e0e2299..f9ebca7d 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/Dependency/Config/Config.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,7 +29,7 @@
 BASE_NAME= PciIo_PciIoBbTest
 FILE_GUID= CE59517D-988F-4d45-A78E-177B09C743CE
 COMPONENT_TYPE   = BS_DRIVER
-#BUILD_TYPE   = CUSTOM_MAKEFILE
+MODULE_TYPE  = UEFI_DRIVER
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
 
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf
index 7024fec0..a3203b5f 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/Dependency/Config/Config.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,6 +29,7 @@
 BASE_NAME= PciRootBridgeIo_PciRootBridgeIoBbTest
 FILE_GUID= FDD56A08-E483-49c5-8173-49D92748E77C
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 25/30] EFI/Protocol: Fix inf files for SimpleText protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/SimpleTextInBBTest.inf   | 27 -
 .../BlackBoxTest/SimpleTextInputExBBTest.inf  | 26 +
 .../BlackBoxTest/SimpleTextOutBBTest_uefi.inf | 29 ++-
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf
index 58f4e694..7e48b285 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextIn/BlackBoxTest/SimpleTextInBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= SimpleTextInBBTest
 FILE_GUID= F2B23429-F4F2-4f47-BC26-3E76B5C35DB6
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeBBTestSimpleTextIn
 
 [sources.common]
   SimpleTextInBBTestMain.c
@@ -38,20 +43,16 @@ COMPONENT_TYPE   = BS_DRIVER
   SimpleTextInBBTestData.c
   Guid.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/SctPkg/Include/Legacy
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT = InitializeBBTestSimpleTextIn
+[Protocols]
+  gBlackBoxEfiSimpleTextInProtocolGuid
+  gBlackBoxEfiDevicePathProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf
index 4dd1ac79..dfe55525 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextInputEx/BlackBoxTest/SimpleTextInputExBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= SimpleTextInputExBBTest
 FILE_GUID= 2B09ED2D-8F15-4e56-A4B5-988209FA7DC4
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeSimpleTextInputExBBTest
 
 [sources.common]
   SimpleTextInputExBBTestConformance.c
@@ -35,19 +40,16 @@ COMPONENT_TYPE   = BS_DRIVER
   SimpleTextInputExBBTestMain.c
   Guid.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT=InitializeSimpleTextInputExBBTest
+[Protocols]
+  gBlackBoxEfiSimpleTextInputExProtocolGuid
+  gBlackBoxEfiDevicePathProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf
index 48902440..7cb05933 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleTextOut/BlackBoxTest/SimpleTextOutBBTest_uefi.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= SimpleTextOutBBTest
 FILE_GUID= 

[edk2] [edk2-test][PATCH v1 24/30] UEFI/Protocol: Remove struct and enum in Hii defines file.

[Supreeth Venkatesh]

Fix compilation issues in definition file when compiled against edk2
stable tag edk2-stable201903 to avoid mutliple definitions of structures
and enumerations which conflict with MdePkg definitions.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h | 234 -
 1 file changed, 234 deletions(-)

diff --git a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h 
b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
index aed64edb..f352a21e 100644
--- a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
+++ b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h
@@ -41,19 +41,6 @@ typedef UINT16  EFI_DEFAULT_ID;
 typedef UINT32  EFI_HII_FONT_STYLE;
 typedef VOID*EFI_FONT_HANDLE;
 
-//
-// HII package list
-//
-typedef struct {
-  EFI_GUID   PackageListGuid;
-  UINT32 PackageLength;
-} EFI_HII_PACKAGE_LIST_HEADER;
-
-typedef struct {
-  UINT32 Length:24;
-  UINT32 Type:8;
-} EFI_HII_PACKAGE_HEADER;
-
 #define EFI_HII_PACKAGE_TYPE_ALL 0x00
 #define EFI_HII_PACKAGE_TYPE_GUID0x01
 #define EFI_HII_PACKAGE_FORM 0x02
@@ -80,29 +67,6 @@ typedef struct {
 #define EFI_GLYPH_NON_SPACING0x01
 #define EFI_GLYPH_WIDE   0x02
 
-
-typedef struct {
-  CHAR16 UnicodeWeight;
-  UINT8  Attributes;
-  UINT8  GlyphCol1[EFI_GLYPH_HEIGHT];
-} EFI_NARROW_GLYPH;
-
-typedef struct {
-  CHAR16 UnicodeWeight;
-  UINT8  Attributes;
-  UINT8  GlyphCol1[EFI_GLYPH_HEIGHT];
-  UINT8  GlyphCol2[EFI_GLYPH_HEIGHT];
-  UINT8  Pad[3];
-} EFI_WIDE_GLYPH;
-
-typedef struct _EFI_HII_SIMPLE_FONT_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER Header;
-  UINT16 NumberOfNarrowGlyphs;
-  UINT16 NumberOfWideGlyphs;
-  EFI_NARROW_GLYPH   *NarrowGlyphs;
-  EFI_WIDE_GLYPH *WideGlyphs;
-} EFI_HII_SIMPLE_FONT_PACKAGE_HDR;
-
 //
 // Font Package
 //
@@ -151,14 +115,6 @@ typedef struct _EFI_FONT_DISPLAY_INFO {
   EFI_FONT_INFO FontInfo;
 } EFI_FONT_DISPLAY_INFO;
 
-typedef struct _EFI_HII_GLYPH_INFO {
-  UINT16 Width;
-  UINT16 Height;
-  INT16  OffsetX;
-  INT16  OffsetY;
-  INT16  AdvanceX;
-} EFI_HII_GLYPH_INFO;
-
 typedef struct _EFI_GRAPHICS_OUTPUT_PROTOCOL EFI_GRAPHICS_OUTPUT_PROTOCOL;;
 
 typedef struct _EFI_IMAGE_OUTPUT {
@@ -178,15 +134,6 @@ typedef struct _EFI_HII_ROW_INFO {
   UINTNBaselineOffset;
 } EFI_HII_ROW_INFO;
 
-typedef struct _EFI_HII_FONT_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER Header;
-  UINT32 HdrSize;
-  UINT32 GlyphBlockOffset;
-  EFI_HII_GLYPH_INFO Cell;
-  EFI_HII_FONT_STYLE FontStyle;
-  CHAR16 FontFamily[1];
-} EFI_HII_FONT_PACKAGE_HDR;
-
 #define EFI_HII_GIBT_END  0x00
 #define EFI_HII_GIBT_GLYPH0x10
 #define EFI_HII_GIBT_GLYPHS   0x11
@@ -208,14 +155,6 @@ typedef struct _EFI_HII_DEVICE_PATH_PACKAGE {
   EFI_DEVICE_PATH_PROTOCOL *DevicePath;
 } EFI_HII_DEVICE_PATH_PACKAGE;
 
-//
-// GUID Package
-//
-typedef struct _EFI_HII_GUID_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER   Header;
-  EFI_GUID Guid;
-} EFI_HII_GUID_PACKAGE_HDR;
-
 //
 // String Package
 //
@@ -223,20 +162,6 @@ typedef struct _EFI_HII_GUID_PACKAGE_HDR {
 #define UEFI_CONFIG_LANG   L"x-UEFI"
 #define UEFI_CONFIG_LANG2  L"x-i-UEFI" // BUGBUG, spec need to be 
updated.
 
-typedef struct _EFI_HII_STRING_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER  Header;
-  UINT32  HdrSize;
-  UINT32  StringInfoOffset;
-  CHAR16  LanguageWindow[16];
-  EFI_STRING_ID   LanguageName;
-  CHAR8   Language[1];
-} EFI_HII_STRING_PACKAGE_HDR;
-
-typedef struct {
-  UINT8   BlockType;
-  //UINT8 BlockBody[];
-} EFI_HII_STRING_BLOCK;
-
 #define EFI_HII_SIBT_END 0x00
 #define EFI_HII_SIBT_STRING_SCSU 0x10
 #define EFI_HII_SIBT_STRING_SCSU_FONT0x11
@@ -258,16 +183,6 @@ typedef struct {
 // Image Packages
 //
 
-typedef struct _EFI_HII_IMAGE_PACKAGE_HDR {
-  EFI_HII_PACKAGE_HEADER   Header;
-  UINT32   ImageInfoOffset;
-  UINT32   PaletteInfoOffset;
-} EFI_HII_IMAGE_PACKAGE_HDR;
-
-typedef struct _EFI_HII_IMAGE_BLOCK {
-  UINT8BlockType;
-} EFI_HII_IMAGE_BLOCK;
-
 #define EFI_IMAGE_TRANSPARENT  0x0001
 
 typedef struct _EFI_IMAGE_INPUT {
@@ -306,29 +221,6 @@ typedef UINT32EFI_HII_DRAW_FLAGS;
 // Forms Package
 //
 
-typedef struct {
-  UINT8 Hour;
-  UINT8 Minute;
-  UINT8 Second;
-} EFI_HII_TIME;
-
-typedef struct {
-  UINT16 Year;
-  UINT8  Month;
-  UINT8  Day;
-} EFI_HII_DATE;
-

[edk2] [edk2-test][PATCH v1 23/30] EFI/Protocol: Fix inf files for HII related protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/HIIConfigAccessBBTest.inf| 30 
 .../BlackBoxTest/HIIConfigRoutingBBTest.inf   | 27 +++---
 .../BlackBoxTest/HIIDatabaseBBTest.inf| 32 -
 .../HIIFont/BlackBoxTest/HIIFontBBTest.inf| 35 ++-
 .../BlackBoxTest/HIIFontExBBTest.inf  | 35 ++-
 .../HIIImage/BlackBoxTest/HIIImageBBTest.inf  | 34 +-
 .../BlackBoxTest/HIIImageExBBTest.inf | 28 ---
 .../BlackBoxTest/HIIStringBBTest.inf  | 33 -
 8 files changed, 133 insertions(+), 121 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf
index 2ad75dbe..f962241c 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigAccess/BlackBoxTest/HIIConfigAccessBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,30 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= HIIConfigAccessBBTest
 FILE_GUID= 8253381C-3241-4a5c-AD52-BACBC4F08DE8
-
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeHIIConfigAccessBBTest
 
 [sources.common]
   HIIConfigAccessBBTestConformance.c
   HIIConfigAccessBBTestFunction.c
   HIIConfigAccessBBTestMain.c
   Guid.c
-  
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
 
-[libraries.common]
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT=InitializeHIIConfigAccessBBTest
+[Protocols]
+  gBlackBoxEfiHIIConfigAccessProtocolGuid
+  gBlackBoxEfiHIIConfigRoutingProtocolGuid
+  gBlackBoxEfiDevicePathProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf
index 1905c6e8..cabee0af 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIConfigRouting/BlackBoxTest/HIIConfigRoutingBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,31 +26,29 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= HIIConfigRoutingBBTest
 FILE_GUID= 113C7915-EE1F-4c2e-B95B-28C13AE3488D
-
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeBBTestHIIConfigRouting
 
 [sources.common]
   HIIConfigRoutingBBTestConformance.c
   HIIConfigRoutingBBTestFunction.c
   HIIConfigRoutingBBTestMain.c
   Guid.c
-  
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
 
-[libraries.common]
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT=InitializeBBTestHIIConfigRouting
+[Protocols]
 
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf
index 65a7cc0a..5d841ba1 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIDatabase/BlackBoxTest/HIIDatabaseBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the 

[edk2] [edk2-test][PATCH v1 22/30] EFI/Protocol: Fix inf files for DevicePath related protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/DevicePathBBTest.inf | 32 
 .../BlackBoxTest/DevicePathFromTextBBTest.inf | 30 +--
 .../BlackBoxTest/DevicePathToTextBBTest.inf   | 38 +++
 3 files changed, 56 insertions(+), 44 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf
index 8d57aeab..ed214634 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePath/BlackBoxTest/DevicePathBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2015 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,29 +26,26 @@
 #--*/
 
 [defines]
-BASE_NAME= DevicePathBBTest
-FILE_GUID= 5E1013F6-302B-4628-BB28-B5FBB3FC4843
-COMPONENT_TYPE   = BS_DRIVER
+  INF_VERSION  = 0x00010005
+  BASE_NAME= DevicePathBBTest
+  FILE_GUID= 5E1013F6-302B-4628-BB28-B5FBB3FC4843
+  COMPONENT_TYPE   = BS_DRIVER
+  MODULE_TYPE  = UEFI_DRIVER
+  VERSION_STRING   = 1.0
+  ENTRY_POINT  = InitializeBBTestDevicePathProtocol
 
 [sources.common]
   DevicePathBBTestMain.c
   DevicePathBBTestMain.h
   DevicePathBBTestFunction.c
   Guid.c
-  
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
 
-[libraries.common]
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  IMAGE_ENTRY_POINT = InitializeBBTestDevicePathProtocol
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf
index a1c074dd..3a446e5c 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2015 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= DevicePathFromTextBBTest
 FILE_GUID= 013941EE-C9B5-4c21-B10B-0C13921DA929
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeBBTestDevicePathFromTextProtocol
 
 [sources.common]
   DevicePathFromTextBBTestMain.c
@@ -37,19 +42,20 @@ COMPONENT_TYPE   = BS_DRIVER
   DevicePathFromTextBBTestCoverage.c
   Guid.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT = InitializeBBTestDevicePathFromTextProtocol
+[Guids]
+  gBlackBoxEfiPcAnsiGuid
+
+[Protocols]
+  gBlackBoxEfiDevicePathUtilitiesProtocolGuid
+  gBlackBoxEfiDebugPortProtocolGuid
+  gBlackBoxEfiDevicePathToTextProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf
index 913d2c9d..5983fd34 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToTextBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2015 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
-BASE_NAME= DevicePathToTextBBTest
-FILE_GUID= 

[edk2] [edk2-test][PATCH v1 21/30] EFI/Protocol: Fix inf files for Decompress protocol dependency data.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf | 2 ++
 .../BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf | 2 ++
 .../Decompress/BlackBoxTest/Dependency/Config/Config.inf| 2 ++
 .../InvalidCompressedFile1/InvalidCompressedFile1.inf   | 2 ++
 .../Dependency/UncompressedFile1/UncompressedFile1.inf  | 2 ++
 .../Dependency/UncompressedFile2/UncompressedFile2.inf  | 2 ++
 6 files changed, 12 insertions(+)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf
index 43622d7b..b4ba9f9d 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile1/CompressedFile1.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,6 +29,7 @@
 BASE_NAME= Decompress_CompressedFile1
 FILE_GUID= E5D06136-490E-4398-AC10-C8851D43C8DC
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf
index 975aa1d6..17a52c87 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/CompressedFile2/CompressedFile2.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,6 +29,7 @@
 BASE_NAME= Decompress_CompressedFile2
 FILE_GUID= 8F93508C-F2EA-4c11-A885-99255DF1DA3C
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf
index 68aca5e9..64e62987 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Config/Config.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,6 +29,7 @@
 BASE_NAME= Decompress_DecompressBbTest
 FILE_GUID= 9EE6BF79-03CD-407e-B108-96D1F5C90DA6
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf
index 3a6508a1..2c0324da 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/InvalidCompressedFile1/InvalidCompressedFile1.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ 

[edk2] [edk2-test][PATCH v1 20/30] EFI/Protocol: Fix inf file for DebugSupport protocol test.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/DebugSupportBBTest.inf   | 30 +--
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf
index 70130de8..2a0f36c7 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,13 @@
 #--*/
 
 [defines]
-  BASE_NAME= DebugSupportBBTest
-  FILE_GUID= 4D72D5AB-34F3-4d47-A1CD-119B20D7371C
-  COMPONENT_TYPE   = BS_DRIVER
+  INF_VERSION  = 0x00010005
+  BASE_NAME= DebugSupportBBTest
+  FILE_GUID= 4D72D5AB-34F3-4d47-A1CD-119B20D7371C
+  COMPONENT_TYPE   = BS_DRIVER
+  MODULE_TYPE  = UEFI_DRIVER
+  VERSION_STRING   = 1.0
+  ENTRY_POINT  = InitializeBBTestDebugSupport
 
 [sources.common]
   DebugSupportBBTestMain.c
@@ -63,19 +68,12 @@
   Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
   Aarch64/DebugSupportBBTestCacheFunction.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  IMAGE_ENTRY_POINT = InitializeBBTestDebugSupport
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 19/30] BootServices: Fix inf files for ImageServices dependency data files.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage5/InvalidImage5.inf | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage6/InvalidImage6.inf | 2 ++
 .../BlackBoxTest/Dependency/InvalidImage7/InvalidImage7.inf | 2 ++
 7 files changed, 14 insertions(+)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf
index 57a079ad..75dfde36 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage1/InvalidImage1.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -41,6 +42,7 @@
 BASE_NAME= ImageServices_InvalidImage1
 FILE_GUID= 4113463C-D7AF-4624-8396-5FA4B3FEC062
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf
index 42302273..f3119017 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage2/InvalidImage2.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,6 +29,7 @@
 BASE_NAME= ImageServices_InvalidImage2
 FILE_GUID= BAE70423-9A0E-418f-8A24-B61B95C8BD33
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf
index a82ae4d9..bb70cac1 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage3/InvalidImage3.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -28,6 +29,7 @@
 BASE_NAME= ImageServices_InvalidImage3
 FILE_GUID= 69CB9468-D198-4cb6-868C-5F8B7D26DE06
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
 #BUILD_TYPE   = CUSTOM_MAKEFILE
 CUSTOM_MAKEFILE  = MSFT| makefile
 CUSTOM_MAKEFILE  = GCC | GNUmakefile
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf
index c5dba20d..f5bee8b0 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ImageServices/BlackBoxTest/Dependency/InvalidImage4/InvalidImage4.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  

[edk2] [edk2-test][PATCH v1 18/30] RIVL/Protocol: Fix inf files for Udp6 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf  | 31 +--
 .../Udp6ServiceBindingENTSTest.inf| 30 +-
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
index 6dbde295..359a2e42 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6/Udp6ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Udp6_ENTSTest
 FILE_GUID= 9BDED151-34DA-4b54-890F-55CD1467A603
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Udp6ENTSTestMain
 
 [sources.common]
   Udp6ENTSTest.c
   Udp6ENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Udp6ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp6ProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
index 097c06ea..8d4da726 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp6/Udp6ServiceBinding/Udp6ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,31 @@
 #--*/
 
 [Defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Udp6ServiceBinding_ENTSTest
 FILE_GUID= D19405F6-7886-4cb2-9334-EF1188CDC401
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Udp6ServiceBindingENTSTestMain
 
 [Sources.common]
   Udp6ServiceBindingENTSTest.c
   Udp6ServiceBindingENTSTestCase.h
   Udp6ServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Udp6ServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp6ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 17/30] RIVL/Protocol: Fix inf files for Udp4 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf  | 31 +--
 .../Udp4ServiceBindingENTSTest.inf| 31 +--
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf
index aedcbbcd..45a1643c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Udp4_ENTSTest
 FILE_GUID= ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Udp4ENTSTestMain
 
 [sources.common]
   Udp4ENTSTest.c
   Udp4ENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Udp4ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp4ProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf
index 78e5176f..1a315d9c 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Udp4ServiceBinding_ENTSTest
 FILE_GUID= ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Udp4ServiceBindingENTSTestMain
 
 [sources.common]
   Udp4ServiceBindingENTSTest.c
   Udp4ServiceBindingENTSTestCase.h
   Udp4ServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Udp4ServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiUdp4ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 16/30] RIVL/Protocol: Fix inf file for Tcp6 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf  | 30 +--
 .../Tcp6ServiceBindingENTSTest.inf| 30 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf
index d7088aa5..bb692ed5 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6/Tcp6ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Tcp6_ENTSTest
 FILE_GUID= 995565A5-33C0-4f40-8298-F190BE579C29
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Tcp6ENTSTestMain
 
 [sources.common]
   Tcp6ENTSTest.c
   Tcp6ENTSTestCase.c
   Tcp6ENTSTestCase.h
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Tcp6ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp6ProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf
index 5514b758..77cecff4 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp6/Tcp6ServiceBinding/Tcp6ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,32 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Tcp6ServiceBinding_ENTSTest
 FILE_GUID= 6FA66944-99EB-4415-BD1A-BE8B56949D8D
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Tcp6ServiceBindingENTSTestMain
 
 [sources.common]
   Tcp6ServiceBindingENTSTest.c
   Tcp6ServiceBindingENTSTestCase.h
   Tcp6ServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Tcp6ServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp6ServiceBindingProtocolGuid
 
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 15/30] RIVL/Protocol: Fix inf files for Tcp4 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf  | 31 +--
 .../Tcp4ServiceBindingENTSTest.inf| 30 +-
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf
index c9ed1f5b..446d3443 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4/Tcp4ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Tcp4_ENTSTest
 FILE_GUID= 8566CFE6-F5D2-4b35-80F6-238D07A80E01
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Tcp4ENTSTestMain
 
 [sources.common]
   Tcp4ENTSTest.c
   Tcp4ENTSTestCase.c
   Tcp4ENTSTestCase.h
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Tcp4ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp4ProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf
index e449b143..95977baf 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Tcp4/Tcp4ServiceBinding/Tcp4ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,32 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Tcp4ServiceBinding_ENTSTest
 FILE_GUID= B4C44C66-516D-47c2-88DE-93309A6245F7
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Tcp4ServiceBindingENTSTestMain
 
 [sources.common]
   Tcp4ServiceBindingENTSTest.c
   Tcp4ServiceBindingENTSTestCase.h
   Tcp4ServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Tcp4ServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiTcp4ServiceBindingProtocolGuid
 
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 14/30] RIVL/Protocol: Fix inf files for Simple Network protocol test.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../SimpleNetwork/SimpleNetworkENTSTest.inf   | 31 +--
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf
index 0e49b062..a06611da 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/SimpleNetwork/SimpleNetworkENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= SimpleNetwork_ENTSTest
 FILE_GUID= 4D6AC4AB-BB5A-45af-8F69-3CF997CE3F96
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = SimpleNetworkENTSTestMain
 
 [sources.common]
   SimpleNetworkENTSTest.c
   SimpleNetworkENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=SimpleNetworkENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiSimpleNetworkProtocolGuid
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 13/30] RIVL/Protocol: fix inf file for PXE protocol test.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../PXEBaseCode/PXEBaseCodeENTSTest.inf   | 31 +--
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf
index f7ba8c14..034b7597 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/PXEBaseCode/PXEBaseCodeENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= PXEBaseCode_ENTSTest
 FILE_GUID= 1FCFBD59-CBC5-4b09-B1CF-5D971DE3E453
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = PXEBaseCodeENTSTestMain
 
 [sources.common]
   PXEBaseCodeENTSTest.c
   PXEBaseCodeENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=PXEBaseCodeENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiPxeBaseCodeProtocolGuid
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 12/30] RIVL/Protocol: Fix inf files for Mtftp6 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf | 30 +-
 .../Mtftp6ServiceBindingENTSTest.inf  | 31 +--
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf
index f1b2d5ce..eec7fd06 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6/Mtftp6ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Mtftp6_ENTSTest
 FILE_GUID= 62D93034-AC9D-443e-B6E5-D92C7A03D09A
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Mtftp6ENTSTestMain
 
 [sources.common]
   Mtftp6ENTSTest.c
   Mtftp6ENTSTestCase.c
   Mtftp6ENTSTestCase.h
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Mtftp6ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiMtftp6ProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf
index f31626c8..318cf0ee 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp6/Mtftp6ServiceBinding/Mtftp6ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Mtftp6ServiceBinding_ENTSTest
 FILE_GUID= 2D4A55D8-17E4-462e-8327-478D5BD6DA5C
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Mtftp6ServiceBindingENTSTestMain
 
 [sources.common]
   Mtftp6ServiceBindingENTSTest.c
   Mtftp6ServiceBindingENTSTestCase.h
   Mtftp6ServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Mtftp6ServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiMtftp6ServiceBindingProtocolGuid
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 11/30] RIVL/Protocol: Fix inf files for Mtftp4 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf | 31 +--
 .../Mtftp4ServiceBindingENTSTest.inf  | 31 +--
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf
index 22f3c349..ed8d1da8 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4/Mtftp4ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Mtftp4_ENTSTest
 FILE_GUID= ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Mtftp4ENTSTestMain
 
 [sources.common]
   Mtftp4ENTSTest.c
   Mtftp4ENTSTestCase.c
   Mtftp4ENTSTestCase.h
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Mtftp4ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiMtftp4ProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf
index 1ecf43a1..b71d3c8c 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Mtftp4/Mtftp4ServiceBinding/Mtftp4ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Mtftp4ServiceBinding_ENTSTest
 FILE_GUID= ADCD5DCA-FC37-4961-A31A-C93E3E802D24
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Mtftp4ServiceBindingENTSTestMain
 
 [sources.common]
   Mtftp4ServiceBindingENTSTest.c
   Mtftp4ServiceBindingENTSTestCase.h
   Mtftp4ServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Mtftp4ServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiMtftp4ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 10/30] RIVL/Protocol: Fix inf files for Managed network protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../ManagedNetwork/MNP/MnpENTSTest.inf| 30 +--
 .../ManagedNetwork/MNPSB/MnpSBENTSTest.inf| 30 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf
index 8b35dea9..1394532b 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNP/MnpENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,31 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Mnp_ENTSTest
 FILE_GUID= 5F442A3D-AA4A-4d10-A30C-7BC57283D730
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = MnpENTSTestMain
 
 [sources.common]
   MnpENTSTest.c
   MnpENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=MnpENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiManagedNetworkProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf
index b093989e..11e903e6 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/ManagedNetwork/MNPSB/MnpSBENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,31 +26,30 @@
 #--*/
 
 [Defines]
+  INF_VERSION  = 0x00010005
   BASE_NAME= MnpSB_ENTSTest
   FILE_GUID= 5F442A3D-AA4A-4d10-A30C-7BC57283D730
   COMPONENT_TYPE   = BS_DRIVER
+  MODULE_TYPE  = UEFI_DRIVER
+  VERSION_STRING   = 1.0
+  ENTRY_POINT  = MnpSBENTSTestMain
 
 [Sources.common]
   MnpSBENTSTest.c
   MnpSBENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=MnpSBENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiManagedNetworkServiceBindingProtocolGuid
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 09/30] RIVL/Protocol: Fix inf files for Ip6 tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../InternetProtocol6/Ip6/Ip6ENTSTest.inf | 32 -
 .../Ip6Config/Ip6ConfigENTSTest.inf   | 34 +--
 .../Ip6ServiceBindingENTSTest.inf | 34 +--
 3 files changed, 47 insertions(+), 53 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf
index a305ec1c..73a1ea53 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,34 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Ip6_ENTSTest
 FILE_GUID= 22A3B176-E8B9-43b7-B130-32FE26F72739
   
-
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Ip6ENTSTestMain
 
 [sources.common]
   Ip6ENTSTest.c
   Ip6ENTSTestCase.h
   Ip6ENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Ip6ENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp6ProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf
index 7fab578c..35346661 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,34 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Ip6Config_ENTSTest
-FILE_GUID= 0280EF45-39FA-4437-BD41-1028531D654C
  
-
+FILE_GUID= 0280EF45-39FA-4437-BD41-1028531D654C
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Ip6ConfigENTSTestMain
 
 [sources.common]
   Ip6ConfigENTSTest.c
   Ip6ConfigENTSTestCase.h
   Ip6ConfigENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Ip6ConfigENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp6ConfigProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf
index b816dd24..6027e14e 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and 

[edk2] [edk2-test][PATCH v1 08/30] RIVL/Protocol: Fix inf files for InternetProtocol4 tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../InternetProtocol4/Ip4/Ip4ENTSTest.inf | 30 +-
 .../Ip4Config/Ip4ConfigENTSTest.inf   | 31 +--
 .../Ip4Config2/Ip4Config2ENTSTest.inf | 30 +-
 .../Ip4ServiceBindingENTSTest.inf | 31 +--
 4 files changed, 60 insertions(+), 62 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf
index 6604f4d8..557b5c00 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Ip4_ENTSTest
 FILE_GUID= 9F825126-F495-4488-B784-DA04C5EC396B
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Ip4ENTSTestMain
 
 [sources.common]
   Ip4ENTSTest.c
   Ip4ENTSTestCase.h
   Ip4ENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Ip4ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp4ProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf
index 855ecaf9..459cf0d8 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Ip4Config_ENTSTest
 FILE_GUID= 4EF1C1C2-4B2D-4e10-915C-1ECDF510FC8B
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Ip4ConfigENTSTestMain
 
 [sources.common]
   Ip4ConfigENTSTest.c
   Ip4ConfigENTSTestCase.h
   Ip4ConfigENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Ip4ConfigENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiIp4ConfigProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf
index f34c002d..3cb00fb9 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2017 Unified EFI, Inc.
 #  Copyright (c) 2017, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,32 @@
 

[edk2] [edk2-test][PATCH v1 07/30] RIVL/Protocol: Fix inf files for Http protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../RIVL/Protocol/Http/Http/HttpENTSTest.inf  | 31 +--
 .../HttpServiceBindingENTSTest.inf| 31 +--
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf
index 0fee6e94..f750b263 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2017 Unified EFI, Inc.
 #  Copyright (c) 2017, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Http_ENTSTest
 FILE_GUID= 40BD8497-7073-47e8-8F11-E7D5C80A5280
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = HttpENTSTestMain
 
 [sources.common]
   HttpENTSTest.c
   HttpENTSTestCase.c
   HttpENTSTestCase.h
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=HttpENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiHttpProtocolGuid
\ No newline at end of file
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
index 70d50346..e7b12c3d 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2017 Unified EFI, Inc.
 #  Copyright (c) 2017, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,33 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= HttpServiceBinding_ENTSTest
 FILE_GUID= FB06CDB4-10D0-45a0-A1C8-159B221088C9
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = HttpServiceBindingENTSTestMain
 
 [sources.common]
   HttpServiceBindingENTSTest.c
   HttpServiceBindingENTSTestCase.h
   HttpServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=HttpServiceBindingENTSTestMain
 
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiHttpServiceBindingProtocolGuid
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 06/30] RIVL/Protocol: Fix inf files for Dhcp6 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf| 31 +--
 .../Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf | 30 +-
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf
index f996834b..08ee3aa1 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Dhcp6_ENTSTest
 FILE_GUID= E04ABBDD-135B-48db-9196-FBBE9EC48B75
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Dhcp6ENTSTestMain
 
 [sources.common]
   Dhcp6ENTSTest.c
   Dhcp6ENTSTestCase.c
 
-[includes.common]
-  .
-  ./Include
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Dhcp6ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp6ProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf
index d64c912c..9ade3c4e 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,31 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Dhcp6SB_ENTSTest
 FILE_GUID= BCA42DFB-69BA-45da-A0D8-FCB8A6129E42
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Dhcp6SBENTSTestMain
 
 [sources.common]
   Dhcp6SBENTSTest.c
   Dhcp6SBENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Dhcp6SBENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp6ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 05/30] RIVL/Protocol: Fix inf files for Dhcp4 protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf| 30 +--
 .../Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf | 30 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf
index be611928..d9fc239c 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4/Dhcp4ENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,31 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Dhcp4_ENTSTest
 FILE_GUID= 5F442A3D-AA4A-4d10-A30C-7BC57283D730
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Dhcp4ENTSTestMain
 
 [sources.common]
   Dhcp4ENTSTest.c
   Dhcp4ENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Dhcp4ENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp4ProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf
index 14bad7f1..c7d0c797 100644
--- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf
+++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp4/Dhcp4SB/Dhcp4SBENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,31 +26,30 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Dhcp4SB_ENTSTest
 FILE_GUID= 5F442A3D-AA4A-4d10-A30C-7BC57283D730
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = Dhcp4SBENTSTestMain
 
 [sources.common]
   Dhcp4SBENTSTest.c
   Dhcp4SBENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=Dhcp4SBENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiDhcp4ServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 04/30] RIVL/Protocol: Fix inf files for RIVL Arp protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../Arp/ArpENTSTest.inf   | 30 +--
 .../ArpServiceBindingENTSTest.inf | 30 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf
index cc38a6a1..8223072c 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/Arp/ArpENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,31 @@
 #--*/
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= Arp_ENTSTest
 FILE_GUID= 47DDDC20-08A3-44c2-BB40-D27AD2D62433
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = ArpENTSTestMain
 
 [sources.common]
   ArpENTSTest.c
   ArpENTSTestCase.h
   ArpENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=ArpENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiArpProtocolGuid
diff --git 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf
 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf
index 19e24399..089690b8 100644
--- 
a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/AddressResolutionProtocol/ArpServiceBinding/ArpServiceBindingENTSTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2012 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,32 +26,31 @@
 #--*/
 
 [Defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= ArpServiceBinding_ENTSTest
 FILE_GUID= 30C95D2F-093E-4a8a-81D5-D649EB73856A
 COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = ArpServiceBindingENTSTestMain
 
 [Sources.common]
   ArpServiceBindingENTSTest.c
   ArpServiceBindingENTSTestCase.h
   ArpServiceBindingENTSTestCase.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  
$(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include
-  $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
   EntsLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  C_STD_INCLUDE=
-  IMAGE_ENTRY_POINT=ArpServiceBindingENTSTestMain
+[Protocols]
+  gEfiEntsProtocolGuid
+  gBlackBoxEfiLoadedImageProtocolGuid
+  gBlackBoxEfiArpServiceBindingProtocolGuid
\ No newline at end of file
-- 
2.17.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [edk2-test][PATCH v1 03/30] IHV/Protocol: Fix inf files for IHV protocol tests.

[Supreeth Venkatesh]

Fix compilation issues in inf files when compiled against edk2 stable
tag edk2-stable201903.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 .../BlackBoxTest/IhvDevicePathBBTest.inf  | 25 +++---
 .../IhvSimpleFileSystemBBTest.inf | 33 +++
 .../BlackBoxTest/IhvSimpleTextInBBTest.inf| 28 
 .../IhvSimpleTextInputExBBTest.inf| 28 
 .../IhvSimpleTextOutBBTest_uefi.inf   | 29 
 5 files changed, 74 insertions(+), 69 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf
index 47c79374..eaa9aed1 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2015 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -25,9 +26,12 @@
 #--*/
 
 [defines]
+  INF_VERSION  = 0x00010005
   BASE_NAME= IhvDevicePathBBTest
   FILE_GUID= 160EB3DB-0B8C-43f4-9FE5-459087E8B0C4
-  COMPONENT_TYPE   = BS_DRIVER
+  MODULE_TYPE  = UEFI_DRIVER
+  VERSION_STRING   = 1.0
+  ENTRY_POINT  = InitializeBBTestDevicePath
 
 [sources.common]
   DevicePathBBTestMain.c
@@ -35,19 +39,12 @@
   DevicePathBBTestFunction.c
   Guid.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
-
-[nmake.common]
-  IMAGE_ENTRY_POINT = InitializeBBTestDevicePath
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf
index db4079f1..778d1cc5 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/IhvSimpleFileSystemBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2013 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -27,9 +28,12 @@
 
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= IhvSimpleFileSystemBBTest
 FILE_GUID= 39E91E5F-B218-4f80-ADDC-37C0003C5326
-COMPONENT_TYPE   = BS_DRIVER
+MODULE_TYPE  = UEFI_DRIVER
+VERSION_STRING   = 1.0
+ENTRY_POINT  = InitializeBBTestSimpleFileSystem
 
 [sources.common]
   Guid.c
@@ -44,20 +48,21 @@ COMPONENT_TYPE   = BS_DRIVER
   SimpleFileSystemExBBTestFunction_FlushEx.c
   SimpleFileSystemExBBTestFunction_OpenEx.c
 
-[includes.common]
-  .
-  $(WORKSPACE)/SctPkg
-  $(WORKSPACE)/SctPkg/UEFI
-  $(WORKSPACE)/SctPkg/Include
-  $(WORKSPACE)/MdePkg/Include
+[Packages]
+  SctPkg/SctPkg.dec
+  SctPkg/UEFI/UEFI.dec
+  MdePkg/MdePkg.dec
 
-[libraries.common]
+[LibraryClasses]
+  UefiDriverEntryPoint
   SctLib
-  SctGuidLib
   EfiTestLib
-  BaseDebugLibNull
-  CompilerIntrinsicsLib
 
-[nmake.common]
-  IMAGE_ENTRY_POINT=InitializeBBTestSimpleFileSystem
-
+[Guids]
+  gBlackBoxEfiFileInfoGuid
+  gBlackBoxEfiFileSystemInfoGuid
+  gBlackBoxEfiFileSystemVolumeLabelInfoIdGuid
+
+[Protocols]
+
+
diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf
 
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf
index 1d38720d..792488f4 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleTextIn/BlackBoxTest/IhvSimpleTextInBBTest.inf
@@ -2,6 +2,7 @@
 #
 #  Copyright 2006 - 2014 Unified EFI, Inc.
 #  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
+#  Copyright (c) 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
@@ -26,9 +27,12 @@
 
 
 [defines]
+INF_VERSION  = 0x00010005
 BASE_NAME= IhvSimpleTextInBBTest
 FILE_GUID= 

[edk2] [edk2-test][PATCH v1 02/30] SctPkg: Ignore Ebc protocol test for AArch64.

[Supreeth Venkatesh]

1. Modify build scripts to ignore Ebc protocol tests temporarily.
2. Cosmetic changes to fix the text when sct is generated to correctly
identify "UEFI SCT" and "IHV SCT".
3. Remove SctGuildLib as it is unused.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 uefi-sct/SctPkg/CommonGenFramework.sh | 14 +++---
 uefi-sct/SctPkg/UEFI/IHV_SCT.dsc  |  1 -
 uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc |  1 -
 uefi-sct/SctPkg/build.sh  |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/uefi-sct/SctPkg/CommonGenFramework.sh 
b/uefi-sct/SctPkg/CommonGenFramework.sh
index 299f0d62..a803bdea 100755
--- a/uefi-sct/SctPkg/CommonGenFramework.sh
+++ b/uefi-sct/SctPkg/CommonGenFramework.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #  Copyright 2006 - 2017 Unified EFI, Inc.
-#  Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
+#  Copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.
 #  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
 #  (C) Copyright 2017 Hewlett Packard Enterprise Development LP
 #
@@ -35,8 +35,6 @@ then
   rm -rf $Framework
 fi
 
-echo "Generating SCT binary"
-
 mkdir -p $Framework
 mkdir -p $Framework/Data
 mkdir -p $Framework/Dependency
@@ -109,6 +107,7 @@ CopyDependency()
 
 if [ $1 = "uefi_sct" ] 
 then 
+echo "Generating UEFI SCT binary"
 # *
 # Copy the UEFI 2.1 Test Cases
 # *
@@ -152,7 +151,7 @@ then
 cp $ProcessorType/DiskIoBBTest.efi 
$Framework/Test/ > NUL
 #   cp $ProcessorType/DriverDiagnosticsBBTest.efi  
$Framework/Test/ > NUL
 #   cp $ProcessorType/DriverConfigurationBBTest.efi
$Framework/Test/ > NUL
-cp $ProcessorType/EbcBBTest.efi
$Framework/Test/ > NUL
+#   cp $ProcessorType/EbcBBTest.efi
$Framework/Test/ > NUL
 cp $ProcessorType/LoadedImageBBTest.efi
$Framework/Test/ > NUL
 cp $ProcessorType/LoadFileBBTest.efi   
$Framework/Test/ > NUL
 cp $ProcessorType/PciIoBBTest.efi  
$Framework/Test/ > NUL
@@ -261,7 +260,7 @@ then
 CopyDependency ImageServices
 CopyDependency Decompress
 CopyDependency DeviceIo
-CopyDependency Ebc
+#   CopyDependency Ebc
 CopyDependency LoadedImage
 CopyDependency PciIo
 CopyDependency PciRootBridgeIo
@@ -275,6 +274,7 @@ fi
 
 if [ $1 = "ihv_sct" ]
 then
+  echo "Generating IHV SCT binary"
   # *
   # Copy the EFI 1.10 Test Cases for IHV
   # *
@@ -291,7 +291,7 @@ then
 #  cp $ProcessorType/IhvDriverConfigurationBBTest.efi $Framework/Test/ 
> NUL
 #  cp $ProcessorType/IhvDriverDiagnosticsBBTest.efi   $Framework/Test/ 
> NUL
   cp $ProcessorType/IhvDriverDiagnostics2BBTest.efi  $Framework/Test/ 
> NUL
-  cp $ProcessorType/IhvEbcBBTest.efi $Framework/Test/ 
> NUL
+# cp $ProcessorType/IhvEbcBBTest.efi $Framework/Test/ 
> NUL
   cp $ProcessorType/IhvPxeBaseCodeBBTest.efi $Framework/Test/ 
> NUL
 #  cp $ProcessorType/IhvScsiPassThruBBTest.efi$Framework/Test/ 
> NUL
   cp $ProcessorType/IhvSerialIoBBTest.efi$Framework/Test/ 
> NUL
@@ -332,7 +332,7 @@ then
   cp $ProcessorType/IhvDiskIo2BBTest.efi $Framework/Test/ 
> NUL
 
   CopyDependency DeviceIo
-  CopyDependency Ebc
+# CopyDependency Ebc
   CopyDependency PxeBaseCode
 fi
 
diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
index f23164f7..66e9fc01 100644
--- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
@@ -113,7 +113,6 @@
 
 [Libraries]
   SctPkg/Library/SctLib/SctLib.inf
-  SctPkg/Library/SctGuidLib/SctGuidLib.inf
   SctPkg/Library/EfiTestLib/EfiTestLib.inf
 
   SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf
diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc 
b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
index 3733e7c4..38daa091 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
@@ -117,7 +117,6 @@
 
 [Libraries]
   SctPkg/Library/SctLib/SctLib.inf
-  SctPkg/Library/SctGuidLib/SctGuidLib.inf
   SctPkg/Library/EfiTestLib/EfiTestLib.inf
 
   SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf
diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index c49b536b..baf28b40 100755
--- a/uefi-sct/SctPkg/build.sh
+++ b/uefi-sct/SctPkg/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #  Copyright 2006 - 2015 Unified EFI, Inc.
-#  Copyright (c) 2011 - 2018, ARM Ltd. All rights reserved.
+#  Copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions 

[edk2] [edk2-test][PATCH v1 01/30] SctPkg/UEFI: Modify description files to ignore Ebc for AArch64.

[Supreeth Venkatesh]

1. Ignore Ebc protocol test cases for AArch64 temporarily.
2. Fix AARCH64_CC_FLAGS to remove direct inclusion of MdePkg/Include.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Supreeth Venkatesh 
---
 uefi-sct/SctPkg/UEFI/IHV_SCT.dsc  | 18 --
 uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc | 17 +
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
index 586879c0..f23164f7 100644
--- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
@@ -101,7 +101,7 @@
 # 177:  "function  was declared but never referenced"
   RVCT:*_*_ARM_CC_FLAGS= --diag_remark=167 
--diag_suppress=167,1295,188,550,1,68,111,177
 
-  *_*_AARCH64_CC_FLAGS = -D EFIAARCH64 
-I$(WORKSPACE)/MdePkg/Include/AArch64 $(GCC_VER_MACRO)
+  *_*_AARCH64_CC_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO)
   GCC:*_*_AARCH64_CC_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO) -ffreestanding 
-nostdinc -nostdlib -Wno-error=unused-function 
-Wno-error=unused-but-set-variable -Wno-error
   *_*_AARCH64_VFRPP_FLAGS  = -D EFIAARCH64 $(GCC_VER_MACRO)
   *_*_AARCH64_APP_FLAGS= -D EFIAARCH64 $(GCC_VER_MACRO)
@@ -193,12 +193,14 @@ 
SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo/BlackBoxTest/IhvBlockIoBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/IhvBlockIo2BBTest.inf
 
SctPkg/TestCase/UEFI/IHV/Protocol/BusSpecificDriverOverride/BlackBoxTest/IhvBusSpecificDriverOverrideBBTest.inf
 
SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/IhvComponentName2BBTest.inf
+
+
 
SctPkg/TestCase/UEFI/IHV/Protocol/DevicePath/BlackBoxTest/IhvDevicePathBBTest.inf
+
 SctPkg/TestCase/UEFI/IHV/Protocol/DiskIo/BlackBoxTest/IhvDiskIoBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/DiskIo2/BlackBoxTest/IhvDiskIo2BBTest.inf
 
SctPkg/TestCase/UEFI/IHV/Protocol/DriverBinding/BlackBoxTest/IhvDriverBindingBBTest.inf
 
SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest/IhvDriverDiagnostics2BBTest.inf
-SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/IhvPxeBBTest.inf
 
SctPkg/TestCase/UEFI/IHV/Protocol/ScsiPassThru/BlackBoxTest/IhvScsiPassThruBBTest.inf
 SctPkg/TestCase/UEFI/IHV/Protocol/SerialIo/BlackBoxTest/IhvSerialIoBBTest.inf
@@ -220,13 +222,17 @@ 
SctPkg/TestCase/UEFI/IHV/Protocol/AbsolutePointer/BlackBoxTest/IhvAbsolutePointe
 
SctPkg/TestCase/UEFI/IHV/Protocol/StorageSecurityCommand/BlackBoxTest/IhvStorageSecurityCommandBBTest.inf
 
 
SctPkg/TestCase/UEFI/IHV/Protocol/AdapterInfo/BlackBoxTest/IhvAdapterInfoBBTest.inf
-#
-# Dependency files for UEFI/IHV Test
-#
-SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf
+
 
 SctPkg/TestInfrastructure/SCT/Framework/Sct.inf
 
 [Components.IA32, Components.X64]
 
SctPkg/TestCase/UEFI/IHV/Protocol/PlatformDriverOverride/BlackBoxTest/IhvPlatformDriverOverrideBBTest.inf
 
SctPkg/TestCase/UEFI/IHV/Protocol/PlatformToDriverConfiguration/BlackBoxTest/IhvPlatformToDriverConfigurationBBTest.inf
+SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/IhvEbcBBTest.inf
+#
+# Dependency files for UEFI/IHV Test
+#
+SctPkg/TestCase/UEFI/IHV/Protocol/Ebc/BlackBoxTest/Dependency/EbcDriverBin/EbcDriverBin.inf
+
+
diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc 
b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
index b6149cc4..3733e7c4 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
@@ -105,7 +105,7 @@
 # 177:  "function  was declared but never referenced"
   RVCT:*_*_ARM_CC_FLAGS= --diag_remark=167 
--diag_suppress=167,1295,188,550,1,68,111,177
 
-  *_*_AARCH64_CC_FLAGS = -D EFIAARCH64 
-I$(WORKSPACE)/MdePkg/Include/AArch64 $(GCC_VER_MACRO)
+  *_*_AARCH64_CC_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO)
   GCC:*_*_AARCH64_CC_FLAGS = -D EFIAARCH64 $(GCC_VER_MACRO) -ffreestanding 
-nostdinc -nostdlib -Wno-error=unused-function 
-Wno-error=unused-but-set-variable -Wno-error
   *_*_AARCH64_VFRPP_FLAGS  = -D EFIAARCH64 $(GCC_VER_MACRO)
   *_*_AARCH64_APP_FLAGS= -D EFIAARCH64 $(GCC_VER_MACRO)
@@ -224,7 +224,7 @@ 
SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathToText/BlackBoxTest/DevicePathToText
 
SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo/BlackBoxTest/DiskIoBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/DiskIo2/BlackBoxTest/DiskIo2BBTest.inf
-SctPkg/TestCase/UEFI/EFI/Protocol/Ebc/BlackBoxTest/EbcBBTest.inf
+
 
SctPkg/TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/LoadedImageBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/LoadFile/BlackBoxTest/LoadFileBBTest.inf
 SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTest.inf
@@ -383,11 +383,6 @@ 
SctPkg/TestCase/UEFI/EFI/Protocol/Decompress/BlackBoxTest/Dependency/Uncompresse
 

[edk2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool

[Supreeth Venkatesh]

From: Lokesh B V 

Some windows editors uses "\r\n" for line feed. While processing uefi
sct testcase info file, the GenBin tool logic to skip line feed doesn't
consider the presence of carraige return(\r) in line feed. So this results
in incorrect format error.

Fixed this issue by changing logic of Trim and Getline functions used
in GenBin source code.

Cc: Supreeth Venkatesh 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Lokesh B V 
---
Changes since v1:
* Adopted changes suggested by Supreeth.
* modified Copyright content

 uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 58 +---
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c 
b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
index 61bb35b..6d8e844 100644
--- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
+++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c
@@ -2,6 +2,7 @@
 
   Copyright 2006 - 2010 Unified EFI, Inc.
   Copyright (c) 2010 Intel Corporation. All rights reserved.
+  Copyright (c) 2018 ARM Ltd. All rights reserved.
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
@@ -32,6 +33,7 @@ Abstract:
 #include 
 #include 
 #include 
+#include 
 
 //
 // Definitions
@@ -49,7 +51,7 @@ PrintUsage (
   void
   );
 
-void
+char *
 Trim (
   char*String
   );
@@ -159,50 +161,42 @@ PrintUsage (
 }
 
 
-void
+char *
 Trim (
   char*String
   )
 {
-  int   Index1;
-  int   Index2;
   int   Length;
+  char  *end;
 
   Length = strlen (String);
 
-  //
-  // Remove the space characters from the beginning of this string
-  //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-if ((String[Index1] != ' ' ) &&
-(String[Index1] != '\t') &&
-(String[Index1] != '\n')) {
-  break;
-}
-  }
-
-  for (Index2 = Index1; Index2 < Length; Index2++) {
-String[Index2 - Index1] = String[Index2];
+  if (!Length) {
+return String;
   }
 
-  Length = Length - Index1;
+  end = String + Length - 1;
 
   //
   // Remove the space characters from the end of this string
   //
-  for (Index1 = 0; Index1 < Length; Index1++) {
-if ((String[Length - 1 - Index1] != ' ' ) &&
-(String[Length - 1 - Index1] != '\t') &&
-(String[Length - 1 - Index1] != '\n')) {
-  break;
-}
+  while (end >= String && isspace (*end)) {
+end--;
   }
 
-  String[Length - Index1] = '\0';
+  *(end + 1) = '\0';
+
+  //
+  // Remove the space characters from the beginning of this string
+  //
+  while (*String && isspace (*String)) {
+String++;
+  }
 
   //
   // Done
   //
+  return String;
 }
 
 
@@ -227,20 +221,20 @@ GetLine (
   return -1;
 }
 
-(*LineNo)++;
-
 //
 // Remove the beginning and ending space characters
 //
-Trim (String);
+String = Trim (Result);
 
 //
-// Ignore the empty line and comment line
+// Skip the empty line and comment line
 //
-if ((String[0] != '\0') &&
-(String[0] != '#' )) {
-  break;
+if ((String[0] == '\0') ||
+(String[0] == '#' )) {
+  continue;
 }
+
+(*LineNo)++;
   }
 
   //
-- 
2.7.4


___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 2/2] CorebootPayloadPkg: Fix non - CRLF line endings

[Agyeman]

Replaced non CRLF line endings with CRLF

Cc: Maurice Ma 
Cc: Benjamin You 

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Agyeman 
---
 .../PlatformHookLib/PlatformHookLib.inf| 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf 
b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
index 3230105901..c16911fe96 100644
--- a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
+++ b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
@@ -19,7 +19,7 @@
   MODULE_TYPE= BASE
   VERSION_STRING = 1.0
   LIBRARY_CLASS  = PlatformHookLib
-  CONSTRUCTOR= PlatformHookSerialPortInitialize
+  CONSTRUCTOR= PlatformHookSerialPortInitialize
 
 [Sources]
   PlatformHookLib.c
@@ -27,7 +27,7 @@
 [LibraryClasses]
   CbParseLib
   PcdLib
-  PciLib
+  PciLib
 
 [Packages]
   MdePkg/MdePkg.dec
@@ -35,10 +35,10 @@
   CorebootModulePkg/CorebootModulePkg.dec
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio ## PRODUCES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase## PRODUCES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate## PRODUCES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride  ## PRODUCES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate   ## PRODUCES
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate ## PRODUCES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters   ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride  ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate   ## PRODUCES
+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters   ## PRODUCES
-- 
2.19.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 1/2] CorebootModulePkg: Fix non - CRLF line endings

[Agyeman]

Replaced non CRLF line endings with CRLF

Cc: Maurice Ma 
Cc: Benjamin You 

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Agyeman 
---
 CorebootModulePkg/Include/Coreboot.h  |   32 +-
 .../BaseSerialPortLib16550.c  | 2178 -
 .../SataControllerDxe/SataController.h| 1082 
 CorebootModulePkg/SecCore/Ia32/Stack.S|  138 +-
 4 files changed, 1715 insertions(+), 1715 deletions(-)

diff --git a/CorebootModulePkg/Include/Coreboot.h 
b/CorebootModulePkg/Include/Coreboot.h
index 784e0b128a..b622e6f17e 100644
--- a/CorebootModulePkg/Include/Coreboot.h
+++ b/CorebootModulePkg/Include/Coreboot.h
@@ -80,7 +80,7 @@ struct imd_root {
   UINT32 max_entries;
   UINT32 num_entries;
   UINT32 flags;
-  UINT32 entry_align;
+  UINT32 entry_align;
   UINT32 max_offset;
   struct imd_entry entries[0];
 };
@@ -165,21 +165,21 @@ struct cb_serial {
   UINT32 type;
   UINT32 baseaddr;
   UINT32 baud;
-  UINT32 regwidth;
-
-  // Crystal or input frequency to the chip containing the UART.
-  // Provide the board specific details to allow the payload to
-  // initialize the chip containing the UART and make independent
-  // decisions as to which dividers to select and their values
-  // to eventually arrive at the desired console baud-rate.
-  UINT32 input_hertz;
-
-  // UART PCI address: bus, device, function
-  // 1 << 31 - Valid bit, PCI UART in use
-  // Bus << 20
-  // Device << 15
-  // Function << 12
-  UINT32 uart_pci_addr;
+  UINT32 regwidth;
+
+  // Crystal or input frequency to the chip containing the UART.
+  // Provide the board specific details to allow the payload to
+  // initialize the chip containing the UART and make independent
+  // decisions as to which dividers to select and their values
+  // to eventually arrive at the desired console baud-rate.
+  UINT32 input_hertz;
+
+  // UART PCI address: bus, device, function
+  // 1 << 31 - Valid bit, PCI UART in use
+  // Bus << 20
+  // Device << 15
+  // Function << 12
+  UINT32 uart_pci_addr;
 };
 
 #define CB_TAG_CONSOLE   0x00010
diff --git 
a/CorebootModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c 
b/CorebootModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
index a5e1755a44..804b948906 100644
--- a/CorebootModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
+++ b/CorebootModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
@@ -1,1095 +1,1095 @@
-/** @file
-  16550 UART Serial Port library functions
-
-  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD 
License
-  which accompanies this distribution.  The full text of the license may be 
found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-//
+/** @file
+  16550 UART Serial Port library functions
+
+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD 
License
+  which accompanies this distribution.  The full text of the license may be 
found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+//
 // PCI Definitions.
-//
-#define PCI_BRIDGE_32_BIT_IO_SPACE  0x01
-
-//
-// 16550 UART register offsets and bitfields
-//
-#define R_UART_RXBUF  0
-#define R_UART_TXBUF  0
-#define R_UART_BAUD_LOW   0
-#define R_UART_BAUD_HIGH  1
-#define R_UART_FCR2
-#define   B_UART_FCR_FIFOEBIT0
-#define   B_UART_FCR_FIFO64   BIT5
-#define R_UART_LCR3
-#define   B_UART_LCR_DLAB BIT7
-#define R_UART_MCR4
-#define   B_UART_MCR_DTRC BIT0
-#define   B_UART_MCR_RTS  BIT1
-#define R_UART_LSR5
-#define   B_UART_LSR_RXRDYBIT0
-#define   B_UART_LSR_TXRDYBIT5
-#define   B_UART_LSR_TEMT BIT6
-#define R_UART_MSR6
-#define   B_UART_MSR_CTS  BIT4
-#define   B_UART_MSR_DSR  BIT5
-#define   B_UART_MSR_RI   BIT6
-#define   B_UART_MSR_DCD  BIT7
-
-//
-// 4-byte structure for each PCI node in PcdSerialPciDeviceInfo
-//
-typedef struct {
-  UINT8   Device;
-  UINT8   Function;
-  UINT16  PowerManagementStatusAndControlRegister;
-} PCI_UART_DEVICE_INFO;
-

Re: [edk2] Build SCT with edk2

[Supreeth Venkatesh]

Ashish,

At-least for Compiling AArch64 SCT binary, I will be sending out a series of 
patches today/tomorrow.
We plan to have a stable edk2-test build based on 
edk2-stable201903
 tag before UEFI Spring plugfest 2019.
Thanks for bringing this up.

Thanks,
Supreeth

From: Ashish Singhal 
Sent: Wednesday, March 27, 2019 3:10 PM
To: edk2-devel@lists.01.org
Cc: Eric Jin ; Supreeth Venkatesh 

Subject: Build SCT with edk2

Hello,

It seems building SCT is supported with edk2 UDK2017 and not something recent. 
When I tried building it with tip, it fails. Is someone already working on 
making sure SCT can be built with edk2 tip?

Thanks
Ashish

This email message is for the sole use of the intended recipient(s) and may 
contain confidential information.  Any unauthorized review, use, disclosure or 
distribution is prohibited.  If you are not the intended recipient, please 
contact the sender by reply email and destroy all copies of the original 
message.

IMPORTANT NOTICE: The contents of this email and any attachments are 
confidential and may also be privileged. If you are not the intended recipient, 
please notify the sender immediately and do not disclose the contents to any 
other person, use it for any purpose, or store or copy the information in any 
medium. Thank you.
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 2/3] MdeModulePkg/UfsPassThruDxe: Refactor UFS device presence detection

[Albecki, Mateusz]

In current implementation we are checking for device presence every
time we execute UIC command. To make UfsExecUicCommands more generic
checking device presence has been moved to UfsDeviceDetection.

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Hao Wu 
Signed-off-by: Albecki Mateusz 
---
 .../Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c| 49 --
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c 
b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
index 9d0793c6be..c37161c4ae 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
@@ -1621,7 +1621,7 @@ Exit1:
 }
 
 /**
-  Sent UIC DME_LINKSTARTUP command to start the link startup procedure.
+  Send UIC command.
 
   @param[in] Private  The pointer to the UFS_PASS_THRU_PRIVATE_DATA 
data structure.
   @param[in] UicOpcodeThe opcode of the UIC command.
@@ -1716,24 +1716,6 @@ UfsExecUicCommands (
 }
   }
 
-  //
-  // Check value of HCS.DP and make sure that there is a device attached to 
the Link.
-  //
-  Status = UfsMmioRead32 (Private, UFS_HC_STATUS_OFFSET, );
-  if (EFI_ERROR (Status)) {
-return Status;
-  }
-
-  if ((Data & UFS_HC_HCS_DP) == 0) {
-Status  = UfsWaitMemSet (Private, UFS_HC_IS_OFFSET, UFS_HC_IS_ULSS, 
UFS_HC_IS_ULSS, UFS_TIMEOUT);
-if (EFI_ERROR (Status)) {
-  return EFI_DEVICE_ERROR;
-}
-return EFI_NOT_FOUND;
-  }
-
-  DEBUG ((DEBUG_INFO, "UfsPassThruDxe: found a attached UFS device\n"));
-
   return EFI_SUCCESS;
 }
 
@@ -1907,8 +1889,9 @@ UfsDeviceDetection (
   IN  UFS_PASS_THRU_PRIVATE_DATA *Private
   )
 {
-  UINTN  Retry;
-  EFI_STATUS Status;
+  UINTN   Retry;
+  EFI_STATUS  Status;
+  UINT32  Data;
 
   //
   // Start UFS device detection.
@@ -1916,22 +1899,26 @@ UfsDeviceDetection (
   //
   for (Retry = 0; Retry < 3; Retry++) {
 Status = UfsExecUicCommands (Private, UfsUicDmeLinkStartup, 0, 0, 0);
-if (!EFI_ERROR (Status)) {
-  break;
+if (EFI_ERROR (Status)) {
+  return EFI_DEVICE_ERROR;
 }
 
-if (Status == EFI_NOT_FOUND) {
-  continue;
+Status = UfsMmioRead32 (Private, UFS_HC_STATUS_OFFSET, );
+if (EFI_ERROR (Status)) {
+  return EFI_DEVICE_ERROR;
 }
 
-return EFI_DEVICE_ERROR;
-  }
-
-  if (Retry == 3) {
-return EFI_NOT_FOUND;
+if ((Data & UFS_HC_HCS_DP) == 0) {
+  Status = UfsWaitMemSet (Private, UFS_HC_IS_OFFSET, UFS_HC_IS_ULSS, 
UFS_HC_IS_ULSS, UFS_TIMEOUT);
+  if (EFI_ERROR (Status)) {
+return EFI_DEVICE_ERROR;
+  }
+} else {
+  return EFI_SUCCESS;
+}
   }
 
-  return EFI_SUCCESS;
+  return EFI_NOT_FOUND;
 }
 
 /**
-- 
2.14.1.windows.1



Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial 
Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | 
Kapital zakladowy 200.000 PLN.

Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i 
moze zawierac informacje poufne. W razie przypadkowego otrzymania tej 
wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; 
jakiekolwiek
przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole 
use of the intended recipient(s). If you are not the intended recipient, please 
contact the sender and delete all copies; any review or distribution by
others is strictly prohibited.

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 3/3] MdeModulePkg/UfsPassThruDxe: Add UFS info protocol

[Albecki, Mateusz]

UFS host controller specification allows for implementation specific
UIC programming to take place just after host controller enable and before
device detection. Since there is no way for generic driver to anticipate
implementation specific programming we add a UFS info protocol
which allows the implementation specific code to pass this information
to generic driver. UFS info protocol is located by the driver at the
BindingStart call and the supported instance is retained throught entire
driver lifetime. Presence of the protocol is optional.

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Hao Wu 
Signed-off-by: Albecki Mateusz 
---
 MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c  | 62 ++
 MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h  |  2 +
 .../Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf  |  1 +
 .../Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c| 60 +
 .../Include/Protocol/UfsHostControllerInfo.h   | 75 ++
 MdeModulePkg/MdeModulePkg.dec  |  3 +
 6 files changed, 203 insertions(+)
 create mode 100644 MdeModulePkg/Include/Protocol/UfsHostControllerInfo.h

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c 
b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
index ea329618dc..a41079e311 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
@@ -40,6 +40,7 @@ UFS_PASS_THRU_PRIVATE_DATA gUfsPassThruTemplate = {
 UfsRwUfsAttribute
   },
   0,  // UfsHostController
+  NULL,   // UfsInfo
   0,  // UfsHcBase
   0,  // Capabilities
   0,  // TaskTag
@@ -776,6 +777,66 @@ UfsFinishDeviceInitialization (
   return EFI_SUCCESS;
 }
 
+/**
+  Locates UFS HC infor protocol suitable for this controller.
+
+  @param[in] DriverBinding Pointer to driver binding protocol
+  @param[in] Private   Pointer to host controller private data
+  @param[in] ControllerHandle  Controller to which driver is bound
+**/
+VOID
+GetUfsHcInfoProtocol (
+  IN EFI_DRIVER_BINDING_PROTOCOL  *DriverBinding,
+  IN UFS_PASS_THRU_PRIVATE_DATA   *Private,
+  IN EFI_HANDLE   ControllerHandle
+  )
+{
+  EFI_STATUSStatus;
+  EFI_HANDLE*ProtocolHandleArray;
+  UINTN NoHandles;
+  UINTN HandleIndex;
+  UFS_HC_INFO_PROTOCOL  *UfsHcInfo;
+
+  Status = gBS->LocateHandleBuffer (
+  ByProtocol,
+  ,
+  NULL,
+  ,
+  
+  );
+  if (EFI_ERROR (Status)) {
+return;
+  }
+
+  for (HandleIndex = 0; HandleIndex < NoHandles; HandleIndex++) {
+Status = gBS->OpenProtocol (
+ProtocolHandleArray[HandleIndex],
+,
+,
+DriverBinding->DriverBindingHandle,
+ControllerHandle,
+EFI_OPEN_PROTOCOL_BY_DRIVER
+);
+if (EFI_ERROR (Status)) {
+  continue;
+}
+if (!EFI_ERROR(UfsHcInfo->Supported (UfsHcInfo, ControllerHandle))) {
+  Private->UfsHcInfo = UfsHcInfo;
+  break;
+} else {
+  Status = gBS->CloseProtocol (
+  ProtocolHandleArray[HandleIndex],
+  ,
+  DriverBinding->DriverBindingHandle,
+  ControllerHandle
+  );
+  ASSERT_EFI_ERROR (Status);
+}
+  }
+
+  FreePool (ProtocolHandleArray);
+}
+
 /**
   Starts a device controller or a bus controller.
 
@@ -871,6 +932,7 @@ UfsPassThruDriverBindingStart (
   Private->UfsHostController= UfsHc;
   Private->UfsHcBase= UfsHcBase;
   InitializeListHead (>Queue);
+  GetUfsHcInfoProtocol (This, Private, Controller);
 
   //
   // Initialize UFS Host Controller H/W.
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h 
b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
index e591e78661..55a8ed9bdf 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "UfsPassThruHci.h"
 
@@ -66,6 +67,7 @@ typedef struct _UFS_PASS_THRU_PRIVATE_DATA {
   EFI_EXT_SCSI_PASS_THRU_PROTOCOL ExtScsiPassThru;
   EFI_UFS_DEVICE_CONFIG_PROTOCOL  UfsDevConfig;
   EDKII_UFS_HOST_CONTROLLER_PROTOCOL  *UfsHostController;
+  UFS_HC_INFO_PROTOCOL*UfsHcInfo;
   UINTN   UfsHcBase;
   UINT32  Capabilities;
 
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf 
b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
index e550cd02b4..12b01771ff 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
+++ 

[edk2] [PATCH 0/3] Implement UFS info protocol to pass additional UIC programming data from platform/silicon specific driver

[Albecki, Mateusz]

UFS specification allows for additional, implementation specific, programming 
to be done during host controller initialization. Since some hosts
might require it to allow for device detection we add a way for 
platform/silicon specific code to pass required attributes and their values to
generic UFS driver. Please see UFS 2.0 specification for details of the host 
controller initialization sequence(JESD223B section 7.1.1 step 4).
Patchset consists of 3 patches to achieve this. The first one is a bugfix for 
data transfers that are not aligned to DWORD boundary such as SCSI SENSE
command. The second one is code refactoring for device presence detection that 
cleans up the function that sends UIC commands. Final patch defines
UFS info protocol and implements driver logic for servicing it.

Tests performed:
-Test UFS LU enumeration with UFS 2.0 card with 3 enabled LUs
-Test that no unaligned data transfers are performed during enumeration
-Test that UIC is programmed according to platform table
-Test that driver operation is not impacted when no UFS info protocol is 
installed

CC: Wu, Hao A 

Albecki, Mateusz (3):
  MdeModulePkg/UfsPassThruDxe: Fix unaligned data transfer handling
  MdeModulePkg/UfsPassThruDxe: Refactor UFS device presence detection
  MdeModulePkg/UfsPassThruDxe: Add UFS info protocol

 MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c  |  62 +
 MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h  |   3 +
 .../Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf  |   1 +
 .../Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c| 299 +++--
 .../Include/Protocol/UfsHostControllerInfo.h   |  75 ++
 MdeModulePkg/MdeModulePkg.dec  |   3 +
 6 files changed, 356 insertions(+), 87 deletions(-)
 create mode 100644 MdeModulePkg/Include/Protocol/UfsHostControllerInfo.h

-- 
2.14.1.windows.1



Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial 
Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | 
Kapital zakladowy 200.000 PLN.

Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i 
moze zawierac informacje poufne. W razie przypadkowego otrzymania tej 
wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; 
jakiekolwiek
przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole 
use of the intended recipient(s). If you are not the intended recipient, please 
contact the sender and delete all copies; any review or distribution by
others is strictly prohibited.

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 1/3] MdeModulePkg/UfsPassThruDxe: Fix unaligned data transfer handling

[Albecki, Mateusz]

Since UFS spcification requiers the data buffer specified
in PRDT to be DWORD aligned in size we had a code in
UfsInitUtpPrdt that aligned the data buffer by rounding down
the buffer size to DWORD boundary. This meant that for SCSI
commands that wanted to perform unaligned data transfer(such as
SENSE command) we specified to small buffer for the data to fit
and transfer was aborted. This change introduces code that allocates
auxilary DWORD aligned data buffer for unaligned transfer. Device
transfers data to aligned buffer and when data transfer is over driver copies
data from aligned buffer to data buffer passed by user.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Albecki, Mateusz 
---
 MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h  |   1 +
 .../Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c| 190 +++--
 2 files changed, 135 insertions(+), 56 deletions(-)

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h 
b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
index b8937842b8..e591e78661 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
@@ -98,6 +98,7 @@ typedef struct {
   UINT32CmdDescSize;
   VOID  *CmdDescHost;
   VOID  *CmdDescMapping;
+  VOID  *AlignedDataBuf;
   VOID  *DataBufMapping;
 
   EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET*Packet;
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c 
b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
index 0238264878..9d0793c6be 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
@@ -400,17 +400,13 @@ UfsInitUtpPrdt (
   UINT8  *Remaining;
   UINTN  PrdtNumber;
 
-  if ((BufferSize & (BIT0 | BIT1)) != 0) {
-BufferSize &= ~(BIT0 | BIT1);
-DEBUG ((DEBUG_WARN, "UfsInitUtpPrdt: The BufferSize [%d] is not 
dword-aligned!\n", BufferSize));
-  }
+  ASSERT (((UINTN)Buffer & (BIT0 | BIT1)) == 0);
+  ASSERT ((BufferSize & (BIT1 | BIT0)) == 0);
 
   if (BufferSize == 0) {
 return EFI_SUCCESS;
   }
 
-  ASSERT (((UINTN)Buffer & (BIT0 | BIT1)) == 0);
-
   RemainingLen = BufferSize;
   Remaining= Buffer;
   PrdtNumber   = (UINTN)DivU64x32 ((UINT64)BufferSize + 
UFS_MAX_DATA_LEN_PER_PRD - 1, UFS_MAX_DATA_LEN_PER_PRD);
@@ -1212,8 +1208,6 @@ UfsSetFlag (
   return Status;
 }
 
-
-
 /**
   Read specified flag from a UFS device.
 
@@ -1323,6 +1317,129 @@ Exit:
   return Status;
 }
 
+/**
+  Cleanup data buffers after data transfer. This function
+  also takes care to copy all data to user memory pool for
+  unaligned data transfers.
+
+  @param[in] Private   Pointer to the UFS_PASS_THRU_PRIVATE_DATA
+  @param[in] TransReq  Pointer to the transfer request
+**/
+VOID
+UfsReconcileDataTransferBuffer (
+  IN UFS_PASS_THRU_PRIVATE_DATA  *Private,
+  IN UFS_PASS_THRU_TRANS_REQ *TransReq
+  )
+{
+  if (TransReq->DataBufMapping != NULL) {
+Private->UfsHostController->Unmap (
+  Private->UfsHostController,
+  TransReq->DataBufMapping
+  );
+  }
+
+  //
+  // Check if unaligned transfer was performed. If it was and we read
+  // data from device copy memory to user data buffers before cleanup.
+  // The assumption is if auxilary aligned data buffer is not NULL then
+  // unaligned transfer has been performed.
+  //
+  if (TransReq->AlignedDataBuf != NULL) {
+if (TransReq->Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {
+  CopyMem (TransReq->Packet->InDataBuffer, TransReq->AlignedDataBuf, 
TransReq->Packet->InTransferLength);
+}
+FreePool (TransReq->AlignedDataBuf);
+TransReq->AlignedDataBuf = NULL;
+  }
+}
+
+/**
+  Prepare data buffer for transfer
+
+  @param[in] Private   Pointer to the UFS_PASS_THRU_PRIVATE_DATA
+  @param[in] TransReq  Pointer to the transfer request
+
+  @retval EFI_DEVICE_ERROR  Failed to prepare buffer for transfer
+  @retval EFI_SUCCESS   Buffer ready for transfer
+**/
+EFI_STATUS
+UfsPrepareDataTransferBuffer (
+  IN UFS_PASS_THRU_PRIVATE_DATA  *Private,
+  IN OUT UFS_PASS_THRU_TRANS_REQ *TransReq
+  )
+{
+  EFI_STATUS   Status;
+  VOID *DataBuf;
+  VOID *AlignedDataBuf;
+  UINT32   DataLen;
+  UINTNMapLength;
+  EFI_PHYSICAL_ADDRESS DataBufPhyAddr;
+  EDKII_UFS_HOST_CONTROLLER_OPERATION  Flag;
+  UTP_TR_PRD   *PrdtBase;
+
+  DataBufPhyAddr = (EFI_PHYSICAL_ADDRESS) NULL;
+  AlignedDataBuf = NULL;
+  DataBuf= NULL;
+
+  //
+  // For unaligned data transfers we allocate auxilary DWORD 

[edk2] [Patch][edk2-platforms/devel-MinnowBoardMax-UDK2017] Vlv2TbltDevicePkg: Change BIOS version.

[Zailiang Sun]

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zailiang Sun 
Cc: David Wei 
Cc: Yi Qian 
---
 Vlv2TbltDevicePkg/BiosId.env | 2 +-
 Vlv2TbltDevicePkg/BiosIdD.env| 2 +-
 Vlv2TbltDevicePkg/BiosIdR.env| 2 +-
 Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +-
 Vlv2TbltDevicePkg/BiosIdx64R.env | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Vlv2TbltDevicePkg/BiosId.env b/Vlv2TbltDevicePkg/BiosId.env
index dfdcb34f41..41206302a1 100644
--- a/Vlv2TbltDevicePkg/BiosId.env
+++ b/Vlv2TbltDevicePkg/BiosId.env
@@ -24,6 +24,6 @@
 BOARD_ID  = MNW2MAX
 BOARD_REV = 1
 BUILD_TYPE= D
-VERSION_MAJOR = 0100
+VERSION_MAJOR = 0101
 VERSION_MINOR = 01
 BOARD_EXT = X64
diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env
index e3bd0053b6..d09438b656 100644
--- a/Vlv2TbltDevicePkg/BiosIdD.env
+++ b/Vlv2TbltDevicePkg/BiosIdD.env
@@ -35,5 +35,5 @@ OEM_ID= I32
 BUILD_TYPE= D
 
 BOARD_ID = BLAKCRB
-VERSION_MAJOR = 0100
+VERSION_MAJOR = 0101
 VERSION_MINOR = 01
diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env
index 4629c44d14..635f2cb662 100644
--- a/Vlv2TbltDevicePkg/BiosIdR.env
+++ b/Vlv2TbltDevicePkg/BiosIdR.env
@@ -35,5 +35,5 @@ OEM_ID= I32
 BUILD_TYPE= R
 
 BOARD_ID = BLAKCRB
-VERSION_MAJOR = 0100
+VERSION_MAJOR = 0101
 VERSION_MINOR = 01
diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env
index 902820b6c3..1c16b2de6c 100644
--- a/Vlv2TbltDevicePkg/BiosIdx64D.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64D.env
@@ -25,6 +25,6 @@ BOARD_REV = 1
 OEM_ID= X64
 BUILD_TYPE= D
 
-VERSION_MAJOR = 0100
+VERSION_MAJOR = 0101
 VERSION_MINOR = 01
 BOARD_ID = BBAYCRB 
diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env
index 7d06cf5bae..69d74c30c7 100644
--- a/Vlv2TbltDevicePkg/BiosIdx64R.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64R.env
@@ -25,6 +25,6 @@ BOARD_REV = 1
 OEM_ID= X64
 BUILD_TYPE= R
 
-VERSION_MAJOR = 0100
+VERSION_MAJOR = 0101
 VERSION_MINOR = 01
 BOARD_ID = BBAYCRB 
-- 
2.19.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC

[Ard Biesheuvel]

On Thu, 28 Mar 2019 at 11:46, Ryszard Knop  wrote:
>
> On Wed, 2019-03-27 at 16:32 +0100, Ard Biesheuvel wrote:
> > On Tue, 29 Jan 2019 at 14:55, Ryszard Knop <
> > ryszard.k...@linux.intel.com> wrote:
> > > +Team
> > >
> >
> > As it turns out, this driver is still broken for non-1:1 mapped DMA.
> >
> > In particular, I am hitting a crash on
> >
> >   E1000MemCopy (
> > (UINT8 *) (UINTN) CpbReceive->BufferAddr,
> > (UINT8 *) (UINTN) ReceiveDescriptor->buffer_addr,
> > TempLen
> >   );
> >
> > (around line 676 in e1000.c), which uses the DMA address
> > 'ReceiveDescriptor->buffer_addr' in a memory copy operation performed
> > by the CPU. This causes a crash on systems where the DMA address is
> > not also a valid CPU address.
>
> Huh, this is new... I don't have access to any system behaving this
> way, so I can't test this, but E1000.c -> E1000TxRxConfigure links
> RxDesc->buffer_addr to the physical addresses, that descriptor is used
> by the hardware to DMA data where needed, and we try to copy from that
> same physical address later, while we should copy from unmapped
> addresses instead.
>

Indeed.

> This probably should be solved by having a separate array/something
> with CurRxInd -> unmapped addresses, but I'll have to talk with my team
> to solve this in a sensible way.
>
> In the meantime, maybe you know if there's a way to simulate this
> situation under QEMU or something?
>

I am using an arm64 board with modified firmware to emulate different
PCIe host bridge configurations. I don't know whether QEMU has support
for non-1:1 mapped DMA on x86, but it does emulate various boards
(such as the raspberry pi 2 iirc) where the CPU and device addressing
is not 1:1.
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC

[Ryszard Knop]

On Wed, 2019-03-27 at 16:32 +0100, Ard Biesheuvel wrote:
> On Tue, 29 Jan 2019 at 14:55, Ryszard Knop <
> ryszard.k...@linux.intel.com> wrote:
> > +Team
> > 
> 
> As it turns out, this driver is still broken for non-1:1 mapped DMA.
> 
> In particular, I am hitting a crash on
> 
>   E1000MemCopy (
> (UINT8 *) (UINTN) CpbReceive->BufferAddr,
> (UINT8 *) (UINTN) ReceiveDescriptor->buffer_addr,
> TempLen
>   );
> 
> (around line 676 in e1000.c), which uses the DMA address
> 'ReceiveDescriptor->buffer_addr' in a memory copy operation performed
> by the CPU. This causes a crash on systems where the DMA address is
> not also a valid CPU address.

Huh, this is new... I don't have access to any system behaving this
way, so I can't test this, but E1000.c -> E1000TxRxConfigure links
RxDesc->buffer_addr to the physical addresses, that descriptor is used
by the hardware to DMA data where needed, and we try to copy from that
same physical address later, while we should copy from unmapped
addresses instead.

This probably should be solved by having a separate array/something
with CurRxInd -> unmapped addresses, but I'll have to talk with my team
to solve this in a sensible way.

In the meantime, maybe you know if there's a way to simulate this
situation under QEMU or something?


> > On Tue, 2019-01-29 at 14:13 +0100, Ryszard Knop wrote:
> > > Hi Ard,
> > > 
> > > I've finally got some time to review and merge all of this. A bit
> > > problematic thing is that we internally have a separate tree that
> > > we
> > > need to merge those commits into, then generate the open source
> > > tree
> > > and related commits from that. This will result in somewhat
> > > broken
> > > history, so sorry about that in advance - we're still figuring
> > > out
> > > the
> > > proper way to handle multiple source trees on our end without
> > > messing
> > > it up. I'll push these changes to edk2-staging once we've got it
> > > all
> > > ready.
> > > 
> > > On Tue, 2018-11-06 at 18:58 +0100, ard.biesheuvela wrote:
> > > > This series fixes the GigUndiDxe in the edk2-staging/Intel_UNDI
> > > > branch
> > > > at github.com/tianocore so it can be built with GCC on Linux
> > > > for
> > > > ARM
> > > > and AARCH64 (as well as X64)
> > > > 
> > > > Ard Biesheuvel (19):
> > > >   IntelOpenSourceUndiPkg.dsc: add AARCH64 and ARM to supported
> > > > architectures
> > > >   IntelUndiPkg: remove EOF markers
> > > >   IntelUndiPkg/GigUndiDxe: consistently use lowercase for e1000
> > > > in
> > > > filenames
> > > >   IntelUndiPkg/GigUndiDxe: consistently use forward slashes as
> > > > path
> > > > separators
> > > >   IntelUndiPkg/GigUndiDxe: move BRAND_STRUCT declaration after
> > > > type
> > > > definition
> > > >   IntelUndiPkg/GigUndiDxe: use intermediate UINTN casts for
> > > > pointers
> > > >   IntelUndiPkg/GigUndiDxe: create GCC alternatives for MSFT
> > > > build
> > > > options
> > > >   IntelUndiPkg/GigUndiDxe: add missing VOID** cast
> > > >   IntelUndiPkg/GigUndiDxe: add missing UINT8* cast
> > > >   IntelUndiPkg/GigUndiDxe: add missing braces to GUID literals
> > > >   IntelUndiPkg/GigUndiDxe: fix incorrect use of CPP token
> > > > pasting
> > > >   IntelUndiPkg/GigUndiDxe: cast E1000MemCopy () args to correct
> > > > pointer
> > > > type
> > > >   IntelUndiPkg/GigUndiDxe: don't take address of cast
> > > > expression
> > > >   IntelUndiPkg/GigUndiDxe: redefine UNREFERENCED_nPARAMETER
> > > > macros
> > > > for
> > > > GCC
> > > >   IntelUndiPkg/GigUndiDxe: remove forward declaration of non-
> > > > existent
> > > > function
> > > >   IntelUndiPkg/GigUndiDxe: fix incorrect indentation
> > > >   IntelUndiPkg/GigUndiDxe: move MSFT warning overrides to INF
> > > > file
> > > >   IntelUndiPkg/GigUndiDxe: add missing EFIAPI modifiers
> > > >   IntelUndiPkg/GigUndiDxe: remove or reorganize unused
> > > > variables
> > > > 
> > > >  IntelUndiPkg/GigUndiDxe/AdapterInformation.c  |  6 ++-
> > > >  IntelUndiPkg/GigUndiDxe/AdapterInformation.h  |  1 -
> > > >  IntelUndiPkg/GigUndiDxe/Brand.c   |  1 -
> > > >  IntelUndiPkg/GigUndiDxe/ComponentName.c   |  5 ++-
> > > >  IntelUndiPkg/GigUndiDxe/ComponentName.h   |  2 +-
> > > >  IntelUndiPkg/GigUndiDxe/Decode.c  |  5 +--
> > > >  IntelUndiPkg/GigUndiDxe/Decode.h  |  1 -
> > > >  IntelUndiPkg/GigUndiDxe/DeviceSupport.c   |  1 -
> > > >  IntelUndiPkg/GigUndiDxe/DeviceSupport.h   |  9 ++---
> > > >  IntelUndiPkg/GigUndiDxe/Dma.c | 11 +++---
> > > >  IntelUndiPkg/GigUndiDxe/Dma.h |  1 -
> > > >  IntelUndiPkg/GigUndiDxe/DriverConfiguration.c |  6 ++-
> > > >  IntelUndiPkg/GigUndiDxe/DriverConfiguration.h |  1 -
> > > >  IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c   | 12 +++---
> > > >  IntelUndiPkg/GigUndiDxe/DriverDiagnostics.h   |  1 -
> > > >  IntelUndiPkg/GigUndiDxe/DriverHealth.c|  5 ++-
> > > >  IntelUndiPkg/GigUndiDxe/EepromConfig.c|  1 

Re: [edk2] [PATCH V5 14/17] MdeModulePkg: Add definitions for EDKII DEBUG PPI

[Ni, Ray]

Zhichao,
I see you added library API called DebugVPrint. Why the interface in the PPI is 
called DebugBPrint?
What does "B" stand for? Why invent a "B" but not use "V"?

> -Original Message-
> From: Gao, Zhichao 
> Sent: Thursday, March 28, 2019 4:10 PM
> To: edk2-devel@lists.01.org
> Cc: Wang, Jian J ; Wu, Hao A ;
> Ni, Ray ; Zeng, Star ; Gao, Liming
> ; Sean Brogan ;
> Michael Turner ; Bret Barkelew
> 
> Subject: [PATCH V5 14/17] MdeModulePkg: Add definitions for EDKII DEBUG
> PPI
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1549
> 
> Add a debug PPI for PEI phase. This PPI will provide basic services of debug.
> PEI debug lib instance can use these services to implement debug function to
> reduce the PEIMs which consume the debug lib.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhichao Gao 
> Cc: Jian J Wang 
> Cc: Hao Wu 
> Cc: Ray Ni 
> Cc: Star Zeng 
> Cc: Liming Gao 
> Cc: Sean Brogan 
> Cc: Michael Turner 
> Cc: Bret Barkelew 
> Reviewed-by: Hao Wu 
> ---
>  MdeModulePkg/Include/Ppi/Debug.h | 82
> 
>  MdeModulePkg/MdeModulePkg.dec|  3 ++
>  2 files changed, 85 insertions(+)
>  create mode 100644 MdeModulePkg/Include/Ppi/Debug.h
> 
> diff --git a/MdeModulePkg/Include/Ppi/Debug.h
> b/MdeModulePkg/Include/Ppi/Debug.h
> new file mode 100644
> index 00..0fb6a8fdc2
> --- /dev/null
> +++ b/MdeModulePkg/Include/Ppi/Debug.h
> @@ -0,0 +1,82 @@
> +/** @file
> +  Define the EDKII_DEBUG_PPI that PEIMs can use to dump info to debug
> port.
> +
> +  Copyright (c) 2019, Intel Corporation. All rights reserved.
> +
> +  This program and the accompanying materials  are licensed and made
> + available under the terms and conditions  of the BSD License which
> + accompanies this distribution.  The  full text of the license may be
> + found at  http://opensource.org/licenses/bsd-license.php
> +
> +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +
> +**/
> +
> +#ifndef __EDKII_DEBUG_PPI_H__
> +#define __EDKII_DEBUG_PPI_H__
> +
> +#include 
> +
> +//
> +// Global ID for the EDKII_DEBUG_PPI
> +//
> +#define EDKII_DEBUG_PPI_GUID \
> +  { \
> +0x999e699c, 0xb013, 0x475e, {0xb1, 0x7b, 0xf3, 0xa8, 0xae, 0x5c,
> +0x48, 0x75} \
> +  }
> +
> +///
> +/// Forward declaration for the PEI_DEBUG_LIB_DEBUG_PPI
> EDKII_DEBUG_PPI
> +/// typedef struct _EDKII_DEBUG_PPI EDKII_DEBUG_PPI;
> +
> +/**
> +  Print a debug message to debug output device if the specified error
> +level
> +  is enabled.
> +
> +  @param[in] ErrorLevel   The error level of the debug message.
> +  @param[in] Format   Format string for the debug message to 
> print.
> +  @param[in] Marker   BASE_LIST marker for the variable 
> argument
> list.
> +
> +**/
> +typedef
> +VOID
> +(EFIAPI *EDKII_DEBUG_BPRINT)(
> +  IN UINTN  ErrorLevel,
> +  IN CONST CHAR8*Format,
> +  IN BASE_LIST  Marker
> +  );
> +
> +/**
> +  Print an assert message containing a filename, line number, and
> description.
> +  This may be followed by a breakpoint or a dead loop.
> +
> +  @param[in] FileName The pointer to the name of the source 
> file
> that
> +  generated the assert condition.
> +  @param[in] LineNumber   The line number in the source file that
> generated
> +  the assert condition
> +  @param[in] Description  The pointer to the description of the 
> assert
> condition.
> +
> +**/
> +typedef
> +VOID
> +(EFIAPI *EDKII_DEBUG_ASSERT)(
> +  IN CONST CHAR8*FileName,
> +  IN UINTN  LineNumber,
> +  IN CONST CHAR8*Description
> +  );
> +
> +///
> +/// This PPI contains a set of services to print message to debug
> +output device /// struct _EDKII_DEBUG_PPI {
> +  EDKII_DEBUG_BPRINTDebugBPrint;
> +  EDKII_DEBUG_ASSERTDebugAssert;
> +};
> +
> +extern EFI_GUID gEdkiiDebugPpiGuid;
> +
> +#endif
> +
> diff --git a/MdeModulePkg/MdeModulePkg.dec
> b/MdeModulePkg/MdeModulePkg.dec index a2130bc439..9bbd0572f5
> 100644
> --- a/MdeModulePkg/MdeModulePkg.dec
> +++ b/MdeModulePkg/MdeModulePkg.dec
> @@ -492,6 +492,9 @@
>## Include/Ppi/AtaPassThru.h
>gEdkiiPeiAtaPassThruPpiGuid   = { 0xa16473fd, 0xd474, 0x4c89, 
> { 0xae,
> 0xc7, 0x90, 0xb8, 0x3c, 0x73, 0x86, 0x9  } }
> 
> +  ## Include/Ppi/Debug.h
> +  gEdkiiDebugPpiGuid= { 0x999e699c, 0xb013, 0x475e, 
> { 0xb1,
> 0x7b, 0xf3, 0xa8, 0xae, 0x5c, 0x48, 0x75 } }
> +
>  [Protocols]
>## Load File protocol provides capability to load and unload EFI image into
> memory and execute it.
>#  Include/Protocol/LoadPe32Image.h
> --
> 2.21.0.windows.1

___

Re: [edk2] [PATCH V5 16/17] MdeModulePkg/PeiDebugLibDebugPpi: Add PEI debug lib

[Ni, Ray]

Zhichao,
For a PEIM, it may not be proper to have a global variable and update that 
global variable during execution.
Because sometimes the PEIM runs from read-only SPI flash, the global variable 
cannot be updated.
I see you have a check against NULL when using that global variable. How about 
just remove the global variable and always locate the PPI?

> -Original Message-
> From: Gao, Zhichao 
> Sent: Thursday, March 28, 2019 4:10 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming ; Wang, Jian J
> ; Wu, Hao A ; Ni, Ray
> ; Zeng, Star ; Sean Brogan
> ; Michael Turner
> ; Bret Barkelew
> 
> Subject: [PATCH V5 16/17] MdeModulePkg/PeiDebugLibDebugPpi: Add PEI
> debug lib
> 
> From: Liming Gao 
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1549
> 
> Add a PEI debug library instance PeiDebugLibDebugPpi base on DebugPpi.
> Using the combination of the DebugServicePei and this lib instance can
> reduce the image size of PEI drivers.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhichao Gao 
> Cc: Jian J Wang 
> Cc: Hao Wu 
> Cc: Ray Ni 
> Cc: Star Zeng 
> Cc: Liming Gao 
> Cc: Sean Brogan 
> Cc: Michael Turner 
> Cc: Bret Barkelew 
> Reviewed-by: Hao Wu 
> ---
>  .../Library/PeiDebugLibDebugPpi/DebugLib.c| 456 ++
>  .../PeiDebugLibDebugPpi.inf   |  56 +++
>  2 files changed, 512 insertions(+)
>  create mode 100644
> MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
>  create mode 100644
> MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf
> 
> diff --git a/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
> b/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
> new file mode 100644
> index 00..349577e5ea
> --- /dev/null
> +++ b/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
> @@ -0,0 +1,456 @@
> +/** @file
> +  PEI debug lib instance base on DebugPpi to save size
> +
> +  Copyright (c) 2019, Intel Corporation. All rights reserved.
> +
> +  This program and the accompanying materials  are licensed and made
> + available under the terms and conditions of the BSD License  which
> + accompanies this distribution.  The full text of the license may be
> + found at  http://opensource.org/licenses/bsd-license.php
> +
> +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +
> +**/
> +
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +
> +EDKII_DEBUG_PPI *mEdkiiDebugPpi = NULL;
> +
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled.
> +
> +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> + function  GetDebugPrintErrorLevel (), then print the message specified
> + by Format and  the associated variable argument list to the debug output
> device.
> +
> +  If Format is NULL, then ASSERT().
> +
> +  @param  ErrorLevelThe error level of the debug message.
> +  @param  FormatFormat string for the debug message to print.
> +  @param  ...   Variable argument list whose contents are accessed
> +based on the format string specified by Format.
> +
> +**/
> +VOID
> +EFIAPI
> +DebugPrint (
> +  IN  UINTNErrorLevel,
> +  IN  CONST CHAR8  *Format,
> +  ...
> +  )
> +{
> +  VA_LIST Marker;
> +
> +  VA_START (Marker, Format);
> +  DebugVPrint (ErrorLevel, Format, Marker);
> +  VA_END (Marker);
> +}
> +
> +
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled.
> +  This function use BASE_LIST which would provide a more compatible
> +  service than VA_LIST.
> +
> +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> + function  GetDebugPrintErrorLevel (), then print the message specified
> + by Format and  the associated variable argument list to the debug output
> device.
> +
> +  If Format is NULL, then ASSERT().
> +
> +  @param  ErrorLevel  The error level of the debug message.
> +  @param  Format  Format string for the debug message to print.
> +  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
> +
> +**/
> +VOID
> +EFIAPI
> +DebugBPrint (
> +  IN  UINTN ErrorLevel,
> +  IN  CONST CHAR8   *Format,
> +  IN  BASE_LIST BaseListMarker
> +  )
> +{
> +  EFI_STATUS  Status;
> +
> +  //
> +  // If Format is NULL, then ASSERT().
> +  //
> +  ASSERT (Format != NULL);
> +
> +  //
> +  // Check driver Debug Level value and global debug level  //  if
> + ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0) {
> +return;
> +  }
> +
> +  if (mEdkiiDebugPpi == NULL) {
> +Status = PeiServicesLocatePpi (
> +,
> +0,
> +NULL,
> +(VOID **)
> +);
> +if (EFI_ERROR (Status)) {
> +  return;
> +}
> +  }
> +
> +  

Re: [edk2] [PATCH V5 10/17] IntelFsp2Pkg/BaseFspDebugLibSerialPort: Add new APIs

[Chiu, Chasel]

No change from V4.
Reviewed-by: Chasel Chiu 

> -Original Message-
> From: Gao, Zhichao
> Sent: Thursday, March 28, 2019 4:10 PM
> To: edk2-devel@lists.01.org
> Cc: Bret Barkelew ; Chiu, Chasel
> ; Desimone, Nathaniel L
> ; Zeng, Star ; Gao,
> Liming ; Sean Brogan ;
> Michael Turner 
> Subject: [PATCH V5 10/17] IntelFsp2Pkg/BaseFspDebugLibSerialPort: Add new
> APIs
> 
> From: Bret Barkelew 
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1395
> 
> Add new APIs' implementation (DebugVPrint, DebugBPrint) in the DebugLib
> instance. These APIs would expose print routines with VaList parameter and
> BaseList parameter.
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhichao Gao 
> Cc: Chasel Chiu 
> Cc: Nate DeSimone 
> Cc: Star Zeng 
> Cc: Liming Gao 
> Cc: Sean Brogan 
> Cc: Michael Turner 
> Cc: Bret Barkelew 
> Reviewed-by: Chasel Chiu 
> ---
>  .../BaseFspDebugLibSerialPort/DebugLib.c  | 103 +-
>  1 file changed, 98 insertions(+), 5 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> index 73bb08e357..8b322c038e 100644
> --- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> +++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
> +  Copyright (c) 2014 - 2019, Intel Corporation. All rights
> + reserved.
>This program and the accompanying materials
>are licensed and made available under the terms and conditions of the BSD
> License
>which accompanies this distribution.  The full text of the license may be 
> found
> at @@ -28,6 +28,12 @@
> 
>  CONST CHAR8  *mHexTable = "0123456789ABCDEF";
> 
> +//
> +// VA_LIST can not initialize to NULL for all compiler, so we use this
> +to // indicate a null VA_LIST //
> +VA_LIST mVaListNull;
> +
>  /**
>Get stack frame pointer of function call.
> 
> @@ -62,9 +68,40 @@ DebugPrint (
>IN  CONST CHAR8  *Format,
>...
>)
> +{
> +  VA_LIST Marker;
> +
> +  VA_START (Marker, Format);
> +  DebugVPrint (ErrorLevel, Format, Marker);
> +  VA_END (Marker);
> +}
> +
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled base on Null-terminated format string and a
> +  VA_LIST argument list or a BASE_LIST argument list.
> +
> +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> + function  GetDebugPrintErrorLevel (), then print the message specified
> + by Format and  the associated variable argument list to the debug output
> device.
> +
> +  If Format is NULL, then ASSERT().
> +
> +  @param  ErrorLevel  The error level of the debug message.
> +  @param  Format  Format string for the debug message to print.
> +  @param  VaListMarkerVA_LIST marker for the variable argument list.
> +  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
> +
> +**/
> +VOID
> +DebugPrintMarker (
> +  IN  UINTN ErrorLevel,
> +  IN  CONST CHAR8   *Format,
> +  IN  VA_LIST   VaListMarker,
> +  IN  BASE_LIST BaseListMarker
> +  )
>  {
>CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
> -  VA_LIST  Marker;
> 
>//
>// If Format is NULL, then ASSERT().
> @@ -88,9 +125,11 @@ DebugPrint (
>//
>// Convert the DEBUG() message to an ASCII String
>//
> -  VA_START (Marker, Format);
> -  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
> -  VA_END (Marker);
> +  if (BaseListMarker == NULL) {
> +AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);  }
> + else {
> +AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);  }
> 
>//
>// Send the print string to a Serial Port @@ -98,6 +137,60 @@ DebugPrint (
>SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer));  }
> 
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled.
> +
> +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> + function  GetDebugPrintErrorLevel (), then print the message specified
> + by Format and  the associated variable argument list to the debug output
> device.
> +
> +  If Format is NULL, then ASSERT().
> +
> +  @param  ErrorLevelThe error level of the debug message.
> +  @param  FormatFormat string for the debug message to print.
> +  @param  VaListMarker  VA_LIST marker for the variable argument list.
> +
> +**/
> +VOID
> +EFIAPI
> +DebugVPrint (
> +  IN  UINTN ErrorLevel,
> +  IN  CONST CHAR8   *Format,
> +  IN  VA_LIST   VaListMarker
> +  )
> +{
> +  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL); }
> +
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled.
> +  This function use BASE_LIST which would provide a more compatible
> +  service than VA_LIST.
> +
> +  If any bit in 

Re: [edk2] [PATCH V5 11/17] IntelFspPkg/BaseFspDebugLibSerialPort: Add new APIs

[Chiu, Chasel]

No change from V4.
Reviewed-by: Chasel Chiu 

> -Original Message-
> From: Gao, Zhichao
> Sent: Thursday, March 28, 2019 4:10 PM
> To: edk2-devel@lists.01.org
> Cc: Bret Barkelew ; Chiu, Chasel
> ; Desimone, Nathaniel L
> ; Zeng, Star ; Gao,
> Liming ; Sean Brogan ;
> Michael Turner 
> Subject: [PATCH V5 11/17] IntelFspPkg/BaseFspDebugLibSerialPort: Add new
> APIs
> 
> From: Bret Barkelew 
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1395
> 
> Add new APIs' implementation (DebugVPrint, DebugBPrint) in the DebugLib
> instance. These APIs would expose print routines with VaList parameter and
> BaseList parameter.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhichao Gao 
> Cc: Chasel Chiu 
> Cc: Nate DeSimone 
> Cc: Star Zeng 
> Cc: Liming Gao 
> Cc: Sean Brogan 
> Cc: Michael Turner 
> Cc: Bret Barkelew 
> Reviewed-by: Chasel Chiu 
> ---
>  .../BaseFspDebugLibSerialPort/DebugLib.c  | 103 +-
>  1 file changed, 98 insertions(+), 5 deletions(-)
> 
> diff --git a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> index 73bb08e357..8b322c038e 100644
> --- a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> +++ b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
> +  Copyright (c) 2014 - 2019, Intel Corporation. All rights
> + reserved.
>This program and the accompanying materials
>are licensed and made available under the terms and conditions of the BSD
> License
>which accompanies this distribution.  The full text of the license may be 
> found
> at @@ -28,6 +28,12 @@
> 
>  CONST CHAR8  *mHexTable = "0123456789ABCDEF";
> 
> +//
> +// VA_LIST can not initialize to NULL for all compiler, so we use this
> +to // indicate a null VA_LIST //
> +VA_LIST mVaListNull;
> +
>  /**
>Get stack frame pointer of function call.
> 
> @@ -62,9 +68,40 @@ DebugPrint (
>IN  CONST CHAR8  *Format,
>...
>)
> +{
> +  VA_LIST Marker;
> +
> +  VA_START (Marker, Format);
> +  DebugVPrint (ErrorLevel, Format, Marker);
> +  VA_END (Marker);
> +}
> +
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled base on Null-terminated format string and a
> +  VA_LIST argument list or a BASE_LIST argument list.
> +
> +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> + function  GetDebugPrintErrorLevel (), then print the message specified
> + by Format and  the associated variable argument list to the debug output
> device.
> +
> +  If Format is NULL, then ASSERT().
> +
> +  @param  ErrorLevel  The error level of the debug message.
> +  @param  Format  Format string for the debug message to print.
> +  @param  VaListMarkerVA_LIST marker for the variable argument list.
> +  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
> +
> +**/
> +VOID
> +DebugPrintMarker (
> +  IN  UINTN ErrorLevel,
> +  IN  CONST CHAR8   *Format,
> +  IN  VA_LIST   VaListMarker,
> +  IN  BASE_LIST BaseListMarker
> +  )
>  {
>CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
> -  VA_LIST  Marker;
> 
>//
>// If Format is NULL, then ASSERT().
> @@ -88,9 +125,11 @@ DebugPrint (
>//
>// Convert the DEBUG() message to an ASCII String
>//
> -  VA_START (Marker, Format);
> -  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
> -  VA_END (Marker);
> +  if (BaseListMarker == NULL) {
> +AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);  }
> + else {
> +AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);  }
> 
>//
>// Send the print string to a Serial Port @@ -98,6 +137,60 @@ DebugPrint (
>SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer));  }
> 
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled.
> +
> +  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib
> + function  GetDebugPrintErrorLevel (), then print the message specified
> + by Format and  the associated variable argument list to the debug output
> device.
> +
> +  If Format is NULL, then ASSERT().
> +
> +  @param  ErrorLevelThe error level of the debug message.
> +  @param  FormatFormat string for the debug message to print.
> +  @param  VaListMarker  VA_LIST marker for the variable argument list.
> +
> +**/
> +VOID
> +EFIAPI
> +DebugVPrint (
> +  IN  UINTN ErrorLevel,
> +  IN  CONST CHAR8   *Format,
> +  IN  VA_LIST   VaListMarker
> +  )
> +{
> +  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL); }
> +
> +/**
> +  Prints a debug message to the debug output device if the specified
> +  error level is enabled.
> +  This function use BASE_LIST which would provide a more compatible
> +  service than VA_LIST.
> +
> +  If any bit in 

[edk2] [PATCH V5 13/17] MdeModulePkg/PeiDxeDebugLibReportStatusCode: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Jian J Wang 
Cc: Hao Wu 
Cc: Ray Ni 
Cc: Star Zeng 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Hao Wu 
---
 .../PeiDxeDebugLibReportStatusCode/DebugLib.c | 177 +++---
 1 file changed, 147 insertions(+), 30 deletions(-)

diff --git a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c 
b/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 6f0f416273..6290481173 100644
--- a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -4,7 +4,7 @@
   Note that if the debug message length is larger than the maximum allowable
   record length, then the debug message will be ignored directly.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -27,6 +27,12 @@
 #include 
 #include 
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Prints a debug message to the debug output device if the specified error 
level is enabled.
 
@@ -52,12 +58,48 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  Only one list type is used.
+  If BaseListMarker == NULL, then use VaListMarker.
+  Otherwise use BaseListMarker and the VaListMarker should be initilized as
+  mVaListNull.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   UINT64  Buffer[(EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)) + 
1];
   EFI_DEBUG_INFO  *DebugInfo;
   UINTN   TotalSize;
-  VA_LIST VaListMarker;
-  BASE_LIST   BaseListMarker;
+  BASE_LIST   BaseListMarkerPointer;
   CHAR8   *FormatString;
   BOOLEAN Long;
 
@@ -78,22 +120,22 @@ DebugPrint (
   // Note that the passing-in format string and variable parameters will be 
constructed to
   // the following layout:
   //
-  // Buffer->||
-  // | Padding| 4 bytes
-  //  DebugInfo->||
-  // |  EFI_DEBUG_INFO| sizeof(EFI_DEBUG_INFO)
-  // BaseListMarker->||
-  // |   ...  |
-  // |   variable arguments   | 12 * sizeof (UINT64)
-  // |   ...  |
-  // ||
-  // |   Format String|
-  // ||<- (UINT8 *)Buffer + 
sizeof(Buffer)
+  //Buffer->||
+  //| Padding| 4 bytes
+  // DebugInfo->||
+  //|  EFI_DEBUG_INFO| sizeof(EFI_DEBUG_INFO)
+  // BaseListMarkerPointer->||
+  //|   ...  |
+  //|   variable arguments   | 12 * sizeof (UINT64)
+  //|   ...  |
+  //||
+  //|   Format String|
+  //||<- (UINT8 *)Buffer + 
sizeof(Buffer)
   //
   TotalSize = 4 + sizeof (EFI_DEBUG_INFO) + 12 * sizeof (UINT64) + 
AsciiStrSize (Format);
 
   //
-  // If the TotalSize is larger than 

[edk2] [PATCH V5 12/17] IntelFramworkModulePkg/PeiDxeDebugLibReportStatusCode: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 .../PeiDxeDebugLibReportStatusCode/DebugLib.c | 179 +++---
 1 file changed, 148 insertions(+), 31 deletions(-)

diff --git 
a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c 
b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index b0445115a9..3f3778d84a 100644
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -4,7 +4,7 @@
   Note that if the debug message length is larger than the maximum allowable
   record length, then the debug message will be ignored directly.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -27,6 +27,12 @@
 #include 
 #include 
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Prints a debug message to the debug output device if the specified error 
level is enabled.
 
@@ -52,13 +58,49 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  Only one list type is used.
+  If BaseListMarker == NULL, then use VaListMarker.
+  Otherwise use BaseListMarker and the VaListMarker should be initilized as
+  mVaListNull.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   UINT64  Buffer[(EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)) + 
1];
   EFI_DEBUG_INFO  *DebugInfo;
   UINTN   TotalSize;
   UINTN   DestBufferSize;
-  VA_LIST VaListMarker;
-  BASE_LIST   BaseListMarker;
+  BASE_LIST   BaseListMarkerPointer;
   CHAR8   *FormatString;
   BOOLEAN Long;
 
@@ -79,38 +121,38 @@ DebugPrint (
   // Note that the passing-in format string and variable parameters will be 
constructed to
   // the following layout:
   //
-  // Buffer->||
-  // | Padding| 4 bytes
-  //  DebugInfo->||
-  // |  EFI_DEBUG_INFO| sizeof(EFI_DEBUG_INFO)
-  // BaseListMarker->||
-  // |   ...  |
-  // |   variable arguments   | 12 * sizeof (UINT64)
-  // |   ...  |
-  // ||
-  // |   Format String|
-  // ||<- (UINT8 *)Buffer + 
sizeof(Buffer)
+  //Buffer->||
+  //| Padding| 4 bytes
+  // DebugInfo->||
+  //|  EFI_DEBUG_INFO| sizeof(EFI_DEBUG_INFO)
+  // BaseListMarkerPointer->||
+  //|   ...  |
+  //|   variable arguments   | 12 * sizeof (UINT64)
+  //|   ...  |
+  //||
+  //|   Format String|
+  //||<- (UINT8 *)Buffer + 
sizeof(Buffer)
   //
   TotalSize = 4 + sizeof (EFI_DEBUG_INFO) + 12 * sizeof (UINT64) + 
AsciiStrSize (Format);
 
   //
-  // If 

[edk2] [PATCH V5 15/17] MdeModulePkg: Add a PEIM to install Debug PPI

[Zhichao Gao]

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

Add a PEIM to install Debug PPI so that PEI debug library
instance can locate gEdkiiDebugPpiGuid to implement the
debug functions. Using this PPI can reduce the size of
PEIMs which consume the debug library.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Jian J Wang 
Cc: Hao Wu 
Cc: Ray Ni 
Cc: Star Zeng 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Hao Wu 
---
 .../Universal/DebugServicePei/DebugService.h  |  56 ++
 .../DebugServicePei/DebugServicePei.c | 100 ++
 .../DebugServicePei/DebugServicePei.inf   |  51 +
 .../DebugServicePei/DebugServicePei.uni   |  20 
 4 files changed, 227 insertions(+)
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugService.h
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugServicePei.inf
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugServicePei.uni

diff --git a/MdeModulePkg/Universal/DebugServicePei/DebugService.h 
b/MdeModulePkg/Universal/DebugServicePei/DebugService.h
new file mode 100644
index 00..3e234f76b6
--- /dev/null
+++ b/MdeModulePkg/Universal/DebugServicePei/DebugService.h
@@ -0,0 +1,56 @@
+/** @file
+  Header file of Debug services instances.
+
+  Copyright (c) 2019, Intel Corporation. All rights reserved.
+
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD 
License
+  which accompanies this distribution.  The full text of the license may be 
found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+#ifndef __DEBUG_SERVICE_H__
+#define __DEBUG_SERVICE_H__
+
+#include 
+
+/**
+  Print a debug message to debug output device if the specified error level
+  is enabled.
+
+  @param[in] ErrorLevel   The error level of the debug message.
+  @param[in] Format   Format string for the debug message to 
print.
+  @param[in] Marker   BASE_LIST marker for the variable 
argument list.
+
+**/
+VOID
+EFIAPI
+PeiDebugBPrint(
+  IN UINTN  ErrorLevel,
+  IN CONST CHAR8*Format,
+  IN BASE_LIST  Marker
+  );
+
+/**
+  Prints an assert message containing a filename, line number, and description.
+  This may be followed by a breakpoint or a dead loop.
+
+  @param[in] FileName The pointer to the name of the source 
file that
+  generated the assert condition.
+  @param[in] LineNumber   The line number in the source file that 
generated
+  the assert condition
+  @param[in] Description  The pointer to the description of the 
assert condition.
+
+**/
+VOID
+EFIAPI
+PeiDebugAssert(
+  IN CONST CHAR8*FileName,
+  IN UINTN  LineNumber,
+  IN CONST CHAR8*Description
+  );
+
+#endif
diff --git a/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c 
b/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c
new file mode 100644
index 00..6e85e709cb
--- /dev/null
+++ b/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c
@@ -0,0 +1,100 @@
+/** @file
+  This driver installs gEdkiiDebugPpiGuid PPI to provide
+  debug services for PEIMs.
+
+  Copyright (c) 2019, Intel Corporation. All rights reserved.
+
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD 
License
+  which accompanies this distribution.  The full text of the license may be 
found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include "DebugService.h"
+
+EDKII_DEBUG_PPI mDebugPpi = {
+  PeiDebugBPrint,
+  PeiDebugAssert
+};
+
+EFI_PEI_PPI_DESCRIPTOR mDebugServicePpi = {
+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
+  ,
+  (VOID *)
+};
+
+/**
+  Print a debug message to debug output device if the specified error level
+  is enabled.
+
+  @param[in] ErrorLevel   The error level of the debug message.
+  @param[in] Format   Format string for the debug message to 
print.
+  @param[in] Marker   BASE_LIST marker for the variable 
argument list.
+
+**/
+VOID
+EFIAPI
+PeiDebugBPrint(
+  IN UINTN  ErrorLevel,
+  IN CONST CHAR8*Format,
+  IN BASE_LIST  Marker
+  )

[edk2] [PATCH V5 17/17] MdeModulePkg: Add PEIM and lib to dsc file

[Zhichao Gao]

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

Add the new PEIM DebugServicePei and library instance
PeiDebugLibDebugPpi to dsc file to verify it can build
correctly.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Jian J Wang 
Cc: Hao Wu 
Cc: Ray Ni 
Cc: Star Zeng 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Hao Wu 
---
 MdeModulePkg/MdeModulePkg.dsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 6cd1727a0d..dec441e23e 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -297,6 +297,7 @@
   
MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.inf
   MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   
MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+  MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf
   MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   
MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.inf
   MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
@@ -423,6 +424,8 @@
   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
   MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf
 
+  MdeModulePkg/Universal/DebugServicePei/DebugServicePei.inf
+
   MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
   MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf
   MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
-- 
2.21.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH V5 14/17] MdeModulePkg: Add definitions for EDKII DEBUG PPI

[Zhichao Gao]

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

Add a debug PPI for PEI phase. This PPI will provide basic
services of debug. PEI debug lib instance can use these
services to implement debug function to reduce the PEIMs
which consume the debug lib.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Jian J Wang 
Cc: Hao Wu 
Cc: Ray Ni 
Cc: Star Zeng 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Hao Wu 
---
 MdeModulePkg/Include/Ppi/Debug.h | 82 
 MdeModulePkg/MdeModulePkg.dec|  3 ++
 2 files changed, 85 insertions(+)
 create mode 100644 MdeModulePkg/Include/Ppi/Debug.h

diff --git a/MdeModulePkg/Include/Ppi/Debug.h b/MdeModulePkg/Include/Ppi/Debug.h
new file mode 100644
index 00..0fb6a8fdc2
--- /dev/null
+++ b/MdeModulePkg/Include/Ppi/Debug.h
@@ -0,0 +1,82 @@
+/** @file
+  Define the EDKII_DEBUG_PPI that PEIMs can use to dump info to debug port.
+
+  Copyright (c) 2019, Intel Corporation. All rights reserved.
+
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions
+  of the BSD License which accompanies this distribution.  The
+  full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __EDKII_DEBUG_PPI_H__
+#define __EDKII_DEBUG_PPI_H__
+
+#include 
+
+//
+// Global ID for the EDKII_DEBUG_PPI
+//
+#define EDKII_DEBUG_PPI_GUID \
+  { \
+0x999e699c, 0xb013, 0x475e, {0xb1, 0x7b, 0xf3, 0xa8, 0xae, 0x5c, 0x48, 
0x75} \
+  }
+
+///
+/// Forward declaration for the PEI_DEBUG_LIB_DEBUG_PPI EDKII_DEBUG_PPI
+///
+typedef struct _EDKII_DEBUG_PPI EDKII_DEBUG_PPI;
+
+/**
+  Print a debug message to debug output device if the specified error level
+  is enabled.
+
+  @param[in] ErrorLevel   The error level of the debug message.
+  @param[in] Format   Format string for the debug message to 
print.
+  @param[in] Marker   BASE_LIST marker for the variable 
argument list.
+
+**/
+typedef
+VOID
+(EFIAPI *EDKII_DEBUG_BPRINT)(
+  IN UINTN  ErrorLevel,
+  IN CONST CHAR8*Format,
+  IN BASE_LIST  Marker
+  );
+
+/**
+  Print an assert message containing a filename, line number, and description.
+  This may be followed by a breakpoint or a dead loop.
+
+  @param[in] FileName The pointer to the name of the source 
file that
+  generated the assert condition.
+  @param[in] LineNumber   The line number in the source file that 
generated
+  the assert condition
+  @param[in] Description  The pointer to the description of the 
assert condition.
+
+**/
+typedef
+VOID
+(EFIAPI *EDKII_DEBUG_ASSERT)(
+  IN CONST CHAR8*FileName,
+  IN UINTN  LineNumber,
+  IN CONST CHAR8*Description
+  );
+
+///
+/// This PPI contains a set of services to print message to debug output device
+///
+struct _EDKII_DEBUG_PPI {
+  EDKII_DEBUG_BPRINTDebugBPrint;
+  EDKII_DEBUG_ASSERTDebugAssert;
+};
+
+extern EFI_GUID gEdkiiDebugPpiGuid;
+
+#endif
+
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index a2130bc439..9bbd0572f5 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -492,6 +492,9 @@
   ## Include/Ppi/AtaPassThru.h
   gEdkiiPeiAtaPassThruPpiGuid   = { 0xa16473fd, 0xd474, 0x4c89, { 
0xae, 0xc7, 0x90, 0xb8, 0x3c, 0x73, 0x86, 0x9  } }
 
+  ## Include/Ppi/Debug.h
+  gEdkiiDebugPpiGuid= { 0x999e699c, 0xb013, 0x475e, { 
0xb1, 0x7b, 0xf3, 0xa8, 0xae, 0x5c, 0x48, 0x75 } }
+
 [Protocols]
   ## Load File protocol provides capability to load and unload EFI image into 
memory and execute it.
   #  Include/Protocol/LoadPe32Image.h
-- 
2.21.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH V5 16/17] MdeModulePkg/PeiDebugLibDebugPpi: Add PEI debug lib

[Zhichao Gao]

From: Liming Gao 

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

Add a PEI debug library instance PeiDebugLibDebugPpi base on
DebugPpi. Using the combination of the DebugServicePei and
this lib instance can reduce the image size of PEI drivers.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Jian J Wang 
Cc: Hao Wu 
Cc: Ray Ni 
Cc: Star Zeng 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Hao Wu 
---
 .../Library/PeiDebugLibDebugPpi/DebugLib.c| 456 ++
 .../PeiDebugLibDebugPpi.inf   |  56 +++
 2 files changed, 512 insertions(+)
 create mode 100644 MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
 create mode 100644 
MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf

diff --git a/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c 
b/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
new file mode 100644
index 00..349577e5ea
--- /dev/null
+++ b/MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
@@ -0,0 +1,456 @@
+/** @file
+  PEI debug lib instance base on DebugPpi to save size
+
+  Copyright (c) 2019, Intel Corporation. All rights reserved.
+
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD 
License
+  which accompanies this distribution.  The full text of the license may be 
found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+EDKII_DEBUG_PPI *mEdkiiDebugPpi = NULL;
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  ...   Variable argument list whose contents are accessed
+based on the format string specified by Format.
+
+**/
+VOID
+EFIAPI
+DebugPrint (
+  IN  UINTNErrorLevel,
+  IN  CONST CHAR8  *Format,
+  ...
+  )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  EFI_STATUS  Status;
+
+  //
+  // If Format is NULL, then ASSERT().
+  //
+  ASSERT (Format != NULL);
+
+  //
+  // Check driver Debug Level value and global debug level
+  //
+  if ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0) {
+return;
+  }
+
+  if (mEdkiiDebugPpi == NULL) {
+Status = PeiServicesLocatePpi (
+,
+0,
+NULL,
+(VOID **)
+);
+if (EFI_ERROR (Status)) {
+  return;
+}
+  }
+
+  mEdkiiDebugPpi->DebugBPrint (
+ErrorLevel,
+Format,
+BaseListMarker
+);
+}
+
+
+/**
+  Worker function that convert a VA_LIST to a BASE_LIST based on a
+  Null-terminated format string.
+
+  @param  Format  Null-terminated format string.
+  @param  VaListMarkerVA_LIST style variable argument list consumed
+  by processing Format.
+  @param  BaseListMarker  BASE_LIST style variable argument list consumed
+  by processing Format.
+  @param  SizeThe size, in bytes, of the BaseListMarker buffer.
+
+  @return TRUE   The VA_LIST has been converted to BASE_LIST.
+  @return FALSE  The VA_LIST has not been converted to BASE_LIST.
+
+**/
+BOOLEAN
+VaListToBaseList (
+  IN  CONST CHAR8  *Format,
+  IN  VA_LIST  VaListMarker,
+  OUT BASE_LISTBaseListMarker,
+  IN  UINTNSize
+  )
+{
+  BASE_LIST   BaseListStart;
+  BOOLEAN 

[edk2] [PATCH V5 10/17] IntelFsp2Pkg/BaseFspDebugLibSerialPort: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Chasel Chiu 
Cc: Nate DeSimone 
Cc: Star Zeng 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Chasel Chiu 
---
 .../BaseFspDebugLibSerialPort/DebugLib.c  | 103 +-
 1 file changed, 98 insertions(+), 5 deletions(-)

diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c 
b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
index 73bb08e357..8b322c038e 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
+  Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -28,6 +28,12 @@
 
 CONST CHAR8  *mHexTable = "0123456789ABCDEF";
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Get stack frame pointer of function call.
 
@@ -62,9 +68,40 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
-  VA_LIST  Marker;
 
   //
   // If Format is NULL, then ASSERT().
@@ -88,9 +125,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to an ASCII String
   //
-  VA_START (Marker, Format);
-  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);
+  } else {
+AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);
+  }
 
   //
   // Send the print string to a Serial Port
@@ -98,6 +137,60 @@ DebugPrint (
   SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer));
 }
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, 

[edk2] [PATCH V5 11/17] IntelFspPkg/BaseFspDebugLibSerialPort: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Chasel Chiu 
Cc: Nate DeSimone 
Cc: Star Zeng 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Chasel Chiu 
---
 .../BaseFspDebugLibSerialPort/DebugLib.c  | 103 +-
 1 file changed, 98 insertions(+), 5 deletions(-)

diff --git a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c 
b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
index 73bb08e357..8b322c038e 100644
--- a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
+++ b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
+  Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -28,6 +28,12 @@
 
 CONST CHAR8  *mHexTable = "0123456789ABCDEF";
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Get stack frame pointer of function call.
 
@@ -62,9 +68,40 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
-  VA_LIST  Marker;
 
   //
   // If Format is NULL, then ASSERT().
@@ -88,9 +125,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to an ASCII String
   //
-  VA_START (Marker, Format);
-  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);
+  } else {
+AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);
+  }
 
   //
   // Send the print string to a Serial Port
@@ -98,6 +137,60 @@ DebugPrint (
   SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer));
 }
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, mVaListNull, 

[edk2] [PATCH V5 05/17] MdePkg/UefiDebugLibStdErr: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 MdePkg/Library/UefiDebugLibStdErr/DebugLib.c | 107 ++-
 1 file changed, 102 insertions(+), 5 deletions(-)

diff --git a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c 
b/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
index 6830a3caa1..81fcf168e5 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
@@ -1,7 +1,7 @@
 /** @file
   UEFI Debug Lib that sends messages to the Standard Error Device in the EFI 
System Table.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -29,6 +29,13 @@
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100
 
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
+
 /**
   Prints a debug message to the debug output device if the specified error 
level is enabled.
 
@@ -51,9 +58,41 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   CHAR16   Buffer[MAX_DEBUG_MESSAGE_LENGTH];
-  VA_LIST  Marker;
 
   //
   // If Format is NULL, then ASSERT().
@@ -70,9 +109,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to a Unicode String
   //
-  VA_START (Marker, Format);
-  UnicodeVSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH, Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+UnicodeVSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH, Format, 
VaListMarker);
+  } else {
+UnicodeBSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH, Format, 
BaseListMarker);
+  }
 
   //
   // Send the print string to the Standard Error device
@@ -83,6 +124,62 @@ DebugPrint (
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  

[edk2] [PATCH V5 00/17] Add new APIs DebugVPrint for DebugLib

[Zhichao Gao]

Add a new API DebugVPrint to all the instances of DebugLib.
This API is added to provide a function who want to implement
special debug function with '...' parameter.
Add a PEIM to install gEdkiiDebugPpiGuid, and implement a PEI
debug library instance base on it. All PEIMs except pei core
type can use the PeiDebugLibDebugPpi to reduce its image size.

V2: 
Remove redundant code in DebugPrint.
Fix some coding sytle issues.
Remove some unenforced descirption in the comments of DebugVPrint.

V3:
Add the new API DebugBPrint, it is more useful for consumers which
are care of compatible issue.
Change the interface in gEdkiiDebugPpiGuid. VA_LIST is inappropriate
to appeared in protocol or ppi because different compilers compile
it to different type. It may be a pointer or a structure.

V4:
Sync the implement on MdeModulePkg/PeiDxeDebugLibReportStatusCode to
IntelFramworkModulePkg/PeiDxeDebugLibReportStatusCode. While the format
string is too long just truncate it instead of return.
Fix and update some functions' comments.

V5:
Correct some comments of inf file.
Put all implement into one C file for DebugServicePei.
Use the directly return instead of CpuDeadLoop in PeiDebugLibDebugPpi.
Rename the mDebugPpi to mEdkiiDebugPpi because it has a same name in 
DeubServicePpi.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Leif Lindholm 
Cc: Ard Biesheuvel 
Cc: Jordan Justen 
Cc: Laszlo Ersek 
Cc: Chasel Chiu 
Cc: Nate DeSimone 
Cc: Star Zeng 
Cc: Nate DeSimone 
Cc: Jian J Wang 
Cc: Hao Wu 
Cc: Ray Ni 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 

Bret Barkelew (13):
  MdePkg/DebugLib.h: Add new APIs for DebugLib
  MdePkg/BaseDebugLibNull: Add new APIs for DebugLib
  MdePkg/BaseDebugLibSerialPort: Add new APIs
  MdePkg/UefidebugLibConOut: Add new APIs
  MdePkg/UefiDebugLibStdErr: Add new APIs
  MdePkg/DxeRuntimeDebugLibSerialPort: Add new APIs
  MdePkg/UefiDebuglibDebugPortProtocol: Add new APIs
  ArmPkg/SemiHostingDebugLib: Add new APIs
  OvmfPkg/PlatformDebugLibIoPort: Add new APIs
  IntelFsp2Pkg/BaseFspDebugLibSerialPort: Add new APIs
  IntelFspPkg/BaseFspDebugLibSerialPort: Add new APIs
  IntelFramworkModulePkg/PeiDxeDebugLibReportStatusCode: Add new APIs
  MdeModulePkg/PeiDxeDebugLibReportStatusCode: Add new APIs

Liming Gao (1):
  MdeModulePkg/PeiDebugLibDebugPpi: Add PEI debug lib

Zhichao Gao (3):
  MdeModulePkg: Add definitions for EDKII DEBUG PPI
  MdeModulePkg: Add a PEIM to install Debug PPI
  MdeModulePkg: Add PEIM and lib to dsc file

 ArmPkg/Library/SemiHostingDebugLib/DebugLib.c | 106 +++-
 .../PeiDxeDebugLibReportStatusCode/DebugLib.c | 179 +--
 .../BaseFspDebugLibSerialPort/DebugLib.c  | 103 +++-
 .../BaseFspDebugLibSerialPort/DebugLib.c  | 103 +++-
 MdeModulePkg/Include/Ppi/Debug.h  |  82 
 .../Library/PeiDebugLibDebugPpi/DebugLib.c| 456 ++
 .../PeiDebugLibDebugPpi.inf   |  56 +++
 .../PeiDxeDebugLibReportStatusCode/DebugLib.c | 177 +--
 MdeModulePkg/MdeModulePkg.dec |   3 +
 MdeModulePkg/MdeModulePkg.dsc |   3 +
 .../Universal/DebugServicePei/DebugService.h  |  56 +++
 .../DebugServicePei/DebugServicePei.c | 100 
 .../DebugServicePei/DebugServicePei.inf   |  51 ++
 .../DebugServicePei/DebugServicePei.uni   |  20 +
 MdePkg/Include/Library/DebugLib.h |  52 +-
 MdePkg/Library/BaseDebugLibNull/DebugLib.c|  56 ++-
 .../Library/BaseDebugLibSerialPort/DebugLib.c | 106 +++-
 .../DxeRuntimeDebugLibSerialPort/DebugLib.c   | 106 +++-
 MdePkg/Library/UefiDebugLibConOut/DebugLib.c  | 106 +++-
 .../UefiDebugLibDebugPortProtocol/DebugLib.c  | 106 +++-
 MdePkg/Library/UefiDebugLibStdErr/DebugLib.c  | 107 +++-
 .../Library/PlatformDebugLibIoPort/DebugLib.c | 106 +++-
 22 files changed, 2132 insertions(+), 108 deletions(-)
 create mode 100644 MdeModulePkg/Include/Ppi/Debug.h
 create mode 100644 MdeModulePkg/Library/PeiDebugLibDebugPpi/DebugLib.c
 create mode 100644 
MdeModulePkg/Library/PeiDebugLibDebugPpi/PeiDebugLibDebugPpi.inf
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugService.h
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugServicePei.inf
 create mode 100644 MdeModulePkg/Universal/DebugServicePei/DebugServicePei.uni

-- 
2.21.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH V5 01/17] MdePkg/DebugLib.h: Add new APIs for DebugLib

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs DebugVPrint and DebugBPrint prototype
definition in the DebugLib header file. These APIs
would expose a print routine with VaList parameter
and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 MdePkg/Include/Library/DebugLib.h | 52 ++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/MdePkg/Include/Library/DebugLib.h 
b/MdePkg/Include/Library/DebugLib.h
index e6a7a357b2..77fb1ee259 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -8,7 +8,7 @@
   of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is
   defined, then debug and assert related macros wrapped by it are the NULL 
implementations.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
 This program and the accompanying materials are licensed and made available 
under
 the terms and conditions of the BSD License that accompanies this distribution.
 The full text of the license may be found at
@@ -101,6 +101,56 @@ DebugPrint (
   );
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  );
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  );
+
+
 /**
   Prints an assert message containing a filename, line number, and description.
   This may be followed by a breakpoint or a dead loop.
-- 
2.21.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH V5 06/17] MdePkg/DxeRuntimeDebugLibSerialPort: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 .../DxeRuntimeDebugLibSerialPort/DebugLib.c   | 106 +-
 1 file changed, 101 insertions(+), 5 deletions(-)

diff --git a/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c 
b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c
index e1266f77fa..4af1cde488 100644
--- a/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c
+++ b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c
@@ -4,7 +4,7 @@
   been called, to prevent touching hardware that is no longer owned by the
   firmware.
 
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   Copyright (c) 2018, Linaro, Ltd. All rights reserved.
 
   This program and the accompanying materials
@@ -34,6 +34,12 @@ STATIC BOOLEANmEfiAtRuntime = FALSE;
 //
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Set AtRuntime flag as TRUE after ExitBootServices.
 
@@ -125,9 +131,41 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
-  VA_LIST  Marker;
 
   if (mEfiAtRuntime) {
 return;
@@ -148,9 +186,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to an ASCII String
   //
-  VA_START (Marker, Format);
-  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);
+  } else {
+AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);
+  }
 
   //
   // Send the print string to a Serial Port
@@ -159,6 +199,62 @@ DebugPrint (
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, mVaListNull, BaseListMarker);
+}
+
+
 /**
   Prints an assert message containing a filename, 

[edk2] [PATCH V5 04/17] MdePkg/UefidebugLibConOut: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 MdePkg/Library/UefiDebugLibConOut/DebugLib.c | 106 ++-
 1 file changed, 101 insertions(+), 5 deletions(-)

diff --git a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c 
b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
index f04207c93f..c60ac04a24 100644
--- a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
@@ -1,7 +1,7 @@
 /** @file
   UEFI Debug Library that sends messages to the Console Output Device in the 
EFI System Table.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -27,6 +27,12 @@
 //
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Prints a debug message to the debug output device if the specified error 
level is enabled.
 
@@ -50,9 +56,41 @@ DebugPrint (
   ...
   )
 {
-  CHAR16   Buffer[MAX_DEBUG_MESSAGE_LENGTH];
   VA_LIST  Marker;
 
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  CHAR16   Buffer[MAX_DEBUG_MESSAGE_LENGTH];
+
   //
   // If Format is NULL, then ASSERT().
   //
@@ -68,9 +106,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to a Unicode String
   //
-  VA_START (Marker, Format);
-  UnicodeVSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH,  Format, 
Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+UnicodeVSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH,  Format, 
VaListMarker);
+  } else {
+UnicodeBSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH,  Format, 
BaseListMarker);
+  }
 
 
   //
@@ -82,6 +122,62 @@ DebugPrint (
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  

[edk2] [PATCH V5 09/17] OvmfPkg/PlatformDebugLibIoPort: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Jordan Justen 
Cc: Laszlo Ersek 
Cc: Ard Biesheuvel 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Acked-by: Laszlo Ersek 
---
 .../Library/PlatformDebugLibIoPort/DebugLib.c | 106 +-
 1 file changed, 101 insertions(+), 5 deletions(-)

diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c 
b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
index 36cde54976..cda35faf66 100644
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
@@ -2,7 +2,7 @@
   Base Debug library instance for QEMU debug port.
   It uses PrintLib to send debug messages to a fixed I/O port.
 
-  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   Copyright (c) 2012, Red Hat, Inc.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
@@ -29,6 +29,12 @@
 //
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Prints a debug message to the debug output device if the specified error 
level is enabled.
 
@@ -51,9 +57,41 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
-  VA_LIST  Marker;
   UINTNLength;
 
   //
@@ -72,9 +110,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to an ASCII String
   //
-  VA_START (Marker, Format);
-  Length = AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+Length = AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);
+  } else {
+Length = AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);
+  }
 
   //
   // Send the print string to the debug I/O port
@@ -83,6 +123,62 @@ DebugPrint (
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  DebugPrintMarker 

[edk2] [PATCH V5 08/17] ArmPkg/SemiHostingDebugLib: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Leif Lindholm 
Cc: Ard Biesheuvel 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Leif Lindholm 
---
 ArmPkg/Library/SemiHostingDebugLib/DebugLib.c | 106 +-
 1 file changed, 101 insertions(+), 5 deletions(-)

diff --git a/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c 
b/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c
index ec03edb774..a368dd43b8 100644
--- a/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c
+++ b/ArmPkg/Library/SemiHostingDebugLib/DebugLib.c
@@ -1,7 +1,7 @@
 /** @file
   UEFI Debug Library that uses PrintLib to send messages to STDERR.
 
-  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
@@ -27,6 +27,12 @@
 //
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
 
   Prints a debug message to the debug output device if the specified error 
level is enabled.
@@ -48,9 +54,41 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   CHAR8AsciiBuffer[MAX_DEBUG_MESSAGE_LENGTH];
-  VA_LIST  Marker;
 
   //
   // If Format is NULL, then ASSERT().
@@ -67,14 +105,72 @@ DebugPrint (
   //
   // Convert the DEBUG() message to a Unicode String
   //
-  VA_START (Marker, Format);
-  AsciiVSPrint (AsciiBuffer, sizeof (AsciiBuffer), Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+AsciiVSPrint (AsciiBuffer, sizeof (AsciiBuffer), Format, VaListMarker);
+  } else {
+AsciiBSPrint (AsciiBuffer, sizeof (AsciiBuffer), Format, BaseListMarker);
+  }
 
   SemihostWriteString (AsciiBuffer);
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, mVaListNull, BaseListMarker);

[edk2] [PATCH V5 07/17] MdePkg/UefiDebuglibDebugPortProtocol: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 .../UefiDebugLibDebugPortProtocol/DebugLib.c  | 106 +-
 1 file changed, 101 insertions(+), 5 deletions(-)

diff --git a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c 
b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
index c2209f4123..b1ad2af20a 100644
--- a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
@@ -1,7 +1,7 @@
 /** @file
   UEFI Debug Library that sends messages to EFI_DEBUGPORT_PROTOCOL.Write.
 
-  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -37,6 +37,12 @@
 
 EFI_DEBUGPORT_PROTOCOL *mDebugPort = NULL;
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   Send message to DebugPort Protocol.
 
@@ -106,9 +112,41 @@ DebugPrint (
   IN  CONST CHAR8  *Format,
   ...
   )
+{
+  VA_LIST Marker;
+
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
 {
   CHAR8  Buffer[MAX_DEBUG_MESSAGE_LENGTH];
-  VA_LISTMarker;
 
   //
   // If Format is NULL, then ASSERT().
@@ -125,9 +163,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to an ASCII String
   //
-  VA_START (Marker, Format);
-  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);
+  } else {
+AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);
+  }
 
   //
   // Send the print string to EFI_DEBUGPORT_PROTOCOL.Write.
@@ -136,6 +176,62 @@ DebugPrint (
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, 

[edk2] [PATCH V5 02/17] MdePkg/BaseDebugLibNull: Add new APIs for DebugLib

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 MdePkg/Library/BaseDebugLibNull/DebugLib.c | 56 +-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/MdePkg/Library/BaseDebugLibNull/DebugLib.c 
b/MdePkg/Library/BaseDebugLibNull/DebugLib.c
index 1a7d4aba79..f9c9ac7189 100644
--- a/MdePkg/Library/BaseDebugLibNull/DebugLib.c
+++ b/MdePkg/Library/BaseDebugLibNull/DebugLib.c
@@ -1,7 +1,7 @@
 /** @file
   Null Base Debug Library instance with empty functions.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -41,6 +41,60 @@ DebugPrint (
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+}
+
+
 /**
   Prints an assert message containing a filename, line number, and description.
   This may be followed by a breakpoint or a dead loop.
-- 
2.21.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH V5 03/17] MdePkg/BaseDebugLibSerialPort: Add new APIs

[Zhichao Gao]

From: Bret Barkelew 

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

Add new APIs' implementation (DebugVPrint, DebugBPrint)
in the DebugLib instance. These APIs would expose print
routines with VaList parameter and BaseList parameter.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhichao Gao 
Cc: Michael D Kinney 
Cc: Liming Gao 
Cc: Sean Brogan 
Cc: Michael Turner 
Cc: Bret Barkelew 
Reviewed-by: Liming Gao 
---
 .../Library/BaseDebugLibSerialPort/DebugLib.c | 106 +-
 1 file changed, 101 insertions(+), 5 deletions(-)

diff --git a/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c 
b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
index ffb84b39e5..d875050371 100644
--- a/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
+++ b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
@@ -7,7 +7,7 @@
   being blocked.  This may occur if a key(s) are pressed in a terminal emulator
   used to monitor the DEBUG() and ASSERT() messages.
 
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -32,6 +32,12 @@
 //
 #define MAX_DEBUG_MESSAGE_LENGTH  0x100
 
+//
+// VA_LIST can not initialize to NULL for all compiler, so we use this to
+// indicate a null VA_LIST
+//
+VA_LIST mVaListNull;
+
 /**
   The constructor function initialize the Serial Port Library
 
@@ -70,9 +76,41 @@ DebugPrint (
   ...
   )
 {
-  CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
   VA_LIST  Marker;
 
+  VA_START (Marker, Format);
+  DebugVPrint (ErrorLevel, Format, Marker);
+  VA_END (Marker);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled base on Null-terminated format string and a
+  VA_LIST argument list or a BASE_LIST argument list.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  VaListMarkerVA_LIST marker for the variable argument list.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+DebugPrintMarker (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  CHAR8Buffer[MAX_DEBUG_MESSAGE_LENGTH];
+
   //
   // If Format is NULL, then ASSERT().
   //
@@ -88,9 +126,11 @@ DebugPrint (
   //
   // Convert the DEBUG() message to an ASCII String
   //
-  VA_START (Marker, Format);
-  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);
-  VA_END (Marker);
+  if (BaseListMarker == NULL) {
+AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker);
+  } else {
+AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker);
+  }
 
   //
   // Send the print string to a Serial Port
@@ -99,6 +139,62 @@ DebugPrint (
 }
 
 
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevelThe error level of the debug message.
+  @param  FormatFormat string for the debug message to print.
+  @param  VaListMarker  VA_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugVPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  VA_LIST   VaListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);
+}
+
+
+/**
+  Prints a debug message to the debug output device if the specified
+  error level is enabled.
+  This function use BASE_LIST which would provide a more compatible
+  service than VA_LIST.
+
+  If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib function
+  GetDebugPrintErrorLevel (), then print the message specified by Format and
+  the associated variable argument list to the debug output device.
+
+  If Format is NULL, then ASSERT().
+
+  @param  ErrorLevel  The error level of the debug message.
+  @param  Format  Format string for the debug message to print.
+  @param  BaseListMarker  BASE_LIST marker for the variable argument list.
+
+**/
+VOID
+EFIAPI
+DebugBPrint (
+  IN  UINTN ErrorLevel,
+  IN  CONST CHAR8   *Format,
+  IN  BASE_LIST BaseListMarker
+  )
+{
+  DebugPrintMarker (ErrorLevel, 

Re: [edk2] Build SCT with edk2

[Udit Kumar]

> It seems building SCT is supported with edk2 UDK2017 and not something
SCT build fails on UDK2017 as well 

Below is patch suggested by Supreet with UDK2017 

tmp/sct_workspace/edk2$ git diff

diff --git a/BaseTools/Source/C/Makefiles/app.makefile 
b/BaseTools/Source/C/Makefiles/app.makefile
index e414551b4a..6017b2dd59 100644
--- a/BaseTools/Source/C/Makefiles/app.makefile
+++ b/BaseTools/Source/C/Makefiles/app.makefile
@@ -23,6 +23,6 @@ all: $(MAKEROOT)/bin $(APPLICATION)
$(APPLICATION): $(OBJECTS)
$(LINKER) -o $(APPLICATION) $(BUILD_LFLAGS) $(OBJECTS) 
-L$(MAKEROOT)/libs $(LIBS)

-$(OBJECTS): ../Include/Common/BuildVersion.h
+$(OBJECTS): $(MAKEROOT)/Include/Common/BuildVersion.h

Regards
Udit 

> -Original Message-
> From: edk2-devel  On Behalf Of Ashish
> Singhal
> Sent: Thursday, March 28, 2019 1:40 AM
> To: edk2-devel@lists.01.org
> Cc: Eric Jin 
> Subject: [edk2] Build SCT with edk2
> 
> Hello,
> 
> It seems building SCT is supported with edk2 UDK2017 and not something
> recent. When I tried building it with tip, it fails. Is someone already 
> working
> on making sure SCT can be built with edk2 tip?
> 
> Thanks
> Ashish
> 
> ---
> This email message is for the sole use of the intended recipient(s) and may
> contain confidential information.  Any unauthorized review, use, disclosure
> or distribution is prohibited.  If you are not the intended recipient, please
> contact the sender by reply email and destroy all copies of the original
> message.
> ---
> ___
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.0
> 1.org%2Fmailman%2Flistinfo%2Fedk2-
> develdata=02%7C01%7Cudit.kumar%40nxp.com%7C316c2d64dd8e47
> 99dd5308d6b2f03a7a%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%
> 7C636893142185731611sdata=sA%2F9u6YP5HyMt6w%2BfenjQhtibS5
> ZaqHGlYJZWJbw0CI%3Dreserved=0
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel