date:20190517

Re: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib: Remove CPU generation check

2019-05-17 Thread Zeng, Star

Thanks for the understanding to all of you.


Star
> -Original Message-
> From: Ni, Ray
> Sent: Friday, May 17, 2019 9:11 PM
> To: Zeng, Star ; devel@edk2.groups.io;
> ler...@redhat.com
> Cc: Dong, Eric ; Kumar, Chandana C
> ; Li, Kevin Y 
> Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> Remove CPU generation check
> 
> Star,
> I understand the motivation of the change.
> 
> Given your statement that all processors you met follows the rule, and I
> know that you are currently working very actively on Intel processors,
> Reviewed-by: Ray Ni 
> 
> > -Original Message-
> > From: Zeng, Star
> > Sent: Friday, May 17, 2019 11:05 AM
> > To: Ni, Ray ; devel@edk2.groups.io;
> > ler...@redhat.com
> > Cc: Dong, Eric ; Kumar, Chandana C
> > ; Li, Kevin Y ;
> > Zeng, Star 
> > Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> > Remove CPU generation check
> >
> > Situation: All the generations (including the internal generations not
> > listed in
> > SDM) we saw have MSR 13Ch available when CpuInfo-
> > >CpuIdVersionInfoEcx.Bits.AESNI == 1.
> >
> > Requirement: Reuse more code.
> >
> > Could you help think the good method and even propose the patch for that?
> > I am ok to any method to improve the code's reusability.
> > Otherwise, we can only use function level override method ina
> > CpuSpecificFeaturesLib.
> > Status = RegisterCpuFeature (
> >"AESNI",
> >NULL, // Use core 
> > function
> >SpecificAesniSupport, // Override 
> > core function
> >NULL, // Use core 
> > function
> >CPU_FEATURE_AESNI,
> >CPU_FEATURE_END
> >);
> >
> > Thanks,
> > Star
> > > -Original Message-
> > > From: Ni, Ray
> > > Sent: Friday, May 17, 2019 9:04 AM
> > > To: Zeng, Star ; devel@edk2.groups.io;
> > > ler...@redhat.com
> > > Cc: Dong, Eric ; Kumar, Chandana C
> > > 
> > > Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> > > Remove CPU generation check
> > >
> > > Star,
> > > I think the discussion is about providing the evidence to support
> > > removing the generation check.
> > > Not just the benefit of that.
> > >
> > > Thanks,
> > > Ray
> > >
> > > > -Original Message-
> > > > From: Zeng, Star
> > > > Sent: Thursday, May 16, 2019 10:52 PM
> > > > To: devel@edk2.groups.io; ler...@redhat.com
> > > > Cc: Dong, Eric ; Ni, Ray ;
> > > > Kumar, Chandana C ; Zeng, Star
> > > > 
> > > > Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> > > > Remove CPU generation check
> > > >
> > > > Laszlo,
> > > >
> > > > > -Original Message-
> > > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On
> > > > > Behalf Of Laszlo Ersek
> > > > > Sent: Thursday, May 16, 2019 9:06 PM
> > > > > To: Zeng, Star ; devel@edk2.groups.io
> > > > > Cc: Dong, Eric ; Ni, Ray
> > > > > ; Kumar, Chandana C
> > > > > 
> > > > > Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg
> CpuCommonFeaturesLib:
> > > > > Remove CPU generation check
> > > > >
> > > > > Hi Star,
> > > > >
> > > > > On 05/16/19 12:33, Star Zeng wrote:
> > > > > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1679
> > > > > >
> > > > > > The checking to CpuInfo->CpuIdVersionInfoEcx.Bits.AESNI is
> > > > > > enough, the checking to CPU generation could be removed, then
> > > > > > the code could be reused by more platforms.
> > > > > >
> > > > > > Cc: Laszlo Ersek 
> > > > > > Cc: Eric Dong 
> > > > > > Cc: Ruiyu Ni 
> > > > > > Cc: Chandana Kumar 
> > > > > > Signed-off-by: Star Zeng 
> > > > > > ---
> > > > > >  UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c | 12
> > > > > > +++-
> > > > > >  1 file changed, 3 insertions(+), 9 deletions(-)
> > > > > >
> > > > > > diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > > b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > > index b79446ba3ca9..4a56eec1b267 100644
> > > > > > --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > > +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > > @@ -57,15 +57,9 @@ AesniSupport (
> > > > > >MSR_SANDY_BRIDGE_FEATURE_CONFIG_REGISTER
> > > > *MsrFeatureConfig;
> > > > > >
> > > > > >if (CpuInfo->CpuIdVersionInfoEcx.Bits.AESNI == 1) {
> > > > > > -if (IS_SANDY_BRIDGE_PROCESSOR (CpuInfo->DisplayFamily,
> > > CpuInfo-
> > > > > >DisplayModel) ||
> > > > > > -IS_SILVERMONT_PROCESSOR (CpuInfo->DisplayFamily,
> CpuInfo-
> > > > > >DisplayModel) ||
> > > > > > -IS_XEON_5600_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> > > > > >DisplayModel) ||
> > > > > > -IS_XEON_E7_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> > > > > >DisplayModel) ||
> > > > > > -IS_XEON_PHI_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> > > > > >DisplayModel)) {
> > > > > > -  MsrFeatureConfig =
> > > > >

Re: [edk2-devel] [edk2-platforms] [PATCH 5/5] Intel/Readme.md: Updated readme with linux build instructions

2019-05-17 Thread Kubacki, Michael A

The Known Limitations section needs clean up now.

This text can be removed as a general statement:
"
 * All firmware projects can build on Windows with the validated configuration 
below.
* Cross-platform build support is work-in-progress.
 * KabylakeOpenBoardPkg and ClevoOpenBoardPkg can build on Ubuntu 16.04.5 LTS 
with gcc version 5.4.0 and nasm version 2.11.08 with the build_bios.py script
 "

These are no longer generic limitations. I suggest deleting those bullets 
entirely.

The goal of this series was to add GCC5 build support so each board description 
should be
updated to include the tool chains and version tested to give board-specific 
limitations. For example, 
KabylakeOpenBoardPkg should no longer say " This firmware project build has 
only been tested 
using the Microsoft Visual Studio 2015 compiler." It should say:

* The Windows build was tested on Windows 10 with Visual Studio 2015
* The Linux build was tested on Ubuntu 16.04.5 LTS with GCC version 5.4.0
* The build was tested with NASM version 2.11.08

Please update this information for each board.

Thanks,
Michael

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Agyeman, Prince
> Sent: Wednesday, May 15, 2019 10:36 AM
> To: devel@edk2.groups.io
> Cc: Agyeman, Prince 
> Subject: [edk2-devel] [edk2-platforms] [PATCH 5/5] Intel/Readme.md:
> Updated readme with linux build instructions
> 
> From: Prince Agyeman 
> 
> Signed-off-by: Prince Agyeman 
> ---
>  Platform/Intel/Readme.md | 31 +++
>  1 file changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/Platform/Intel/Readme.md b/Platform/Intel/Readme.md index
> fbf7351..972a1b0 100644
> --- a/Platform/Intel/Readme.md
> +++ b/Platform/Intel/Readme.md
> @@ -107,9 +107,13 @@ return back to the minimum platform caller.
> 
>  **Building with the python script**
> 
> -1. Open command window, go to the workspace directory, e.g. c:\Kabylake.
> -2. Type "cd edk2-platforms\Platform\Intel -3. Type "python build_bios.py -p
> REPLACE_WITH_BOARD_NAME"
> +1. Open command window, go to the workspace directory, e.g. c:\Kabylake
> +or ~/Kabylake in the case of a linux OS 2. If using a linux OS
> +   * Type "cd edk2"
> +   * Type "source edksetup.sh"
> +   * Type "cd ../" to go back to the workspace directory 3. Type "cd
> +edk2-platforms/Platform/Intel 4. Type "python build_bios.py -p
> +REPLACE_WITH_BOARD_NAME"
> 
>  * build_bios.py arguments:
> 
> @@ -132,18 +136,19 @@ return back to the minimum platform caller.
>| |
> 
>  * For more information on build options
> -  * ``Type "python build_bios.py -h"``
> +  * Type "python build_bios.py -h"
> 
>  * Note
> -  * ``Python 2.7.16 and Python 3.7.3 compatible``
> -  * ``These python build scripts have been tested on Windows due to``
> [cross-platform limitations](#Known-limitations)
> +  * Python 2.7.16 and Python 3.7.3 compatible
> +  * This python build script has been tested on Windows 10 and Ubuntu
> + 16.04.5 LTS
> +  * See [cross-platform limitations](#Known-limitations)
> 
>  * Configuration Files
> -  * ``The edk2-platforms\Platform\Intel\build.cfg file contains the default
> settings used by build_bios.py``
> -  * ``The default settings are under the DEFAULT_CONFIG section``
> -  * ``Each board can have a settings file that will override the edk2-
> platforms\Platform\Intel\build.cfg settings``
> -  * ``An example of a board specific settings:``
> -* ``edk2-
> platforms\Platform\Intel\KabylakeOpenBoardPkg\KabylakeRvp3\build_confi
> g.cfg``
> +  * The edk2-platforms\Platform\Intel\build.cfg file contains the
> + default settings used by build_bios.py
> +  * The default settings are under the DEFAULT_CONFIG section
> +  * Each board can have a settings file that will override the
> + edk2-platforms\Platform\Intel\build.cfg settings
> +  * An example of a board specific settings:
> +*
> + edk2-
> platforms\Platform\Intel\KabylakeOpenBoardPkg\KabylakeRvp3\build_
> + config.cfg
> 
>  * Workspace view of the build scripts
>* 
> @@ -212,8 +217,10 @@ Users can also flash the UEFI firmware image to
> the highest area of the flash re
> 
>  ### **Known limitations**
> 
> -* All firmware projects can only build on Windows with the validated
> configuration below.
> +* All firmware projects can build on Windows with the validated
> configuration below.
>* Cross-platform build support is work-in-progress.
> +* KabylakeOpenBoardPkg and ClevoOpenBoardPkg can build on Ubuntu
> +16.04.5 LTS with gcc version 5.4.0 and nasm version 2.11.08 with the
> +build_bios.py script
> 
>  **KabylakeOpenBoardPkg**
>  1. This firmware project has only been tested on the Intel KabylakeRvp3
> board.
> --
> 2.7.4
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40974): https://edk2.groups.io/g/devel/message/40974
Mute This Topic:

Re: [edk2-devel] [edk2-platforms] [PATCH 4/5] ClevoOpenBoardPkg: Added GCC5 build support

2019-05-17 Thread Kubacki, Michael A

Reviewed-by: Michael Kubacki 

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Agyeman, Prince
> Sent: Wednesday, May 15, 2019 10:36 AM
> To: devel@edk2.groups.io
> Cc: Agyeman, Prince 
> Subject: [edk2-devel] [edk2-platforms] [PATCH 4/5] ClevoOpenBoardPkg:
> Added GCC5 build support
> 
> From: Prince Agyeman 
> 
> Fixes:
> * include file paths
> * gcc build options
> 
> Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm
> version 2.11.08
> 
> Signed-off-by: Prince Agyeman 
> ---
> 
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.ds
> c | 2 ++
>  Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec   | 4 ++--
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> dsc
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> dsc
> index 92c7571..8d91d90 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> dsc
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> ds
> +++ c
> @@ -108,6 +108,7 @@ DEFINE DSC_PLTPKG_FEATURE_BUILD_OPTIONS =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(  # For IA32 Specific Build Flag
> #
>  GCC:   *_*_IA32_PP_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> +GCC:   *_*_IA32_CC_FLAGS   =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) -D
> PI_SPECIFICATION_VERSION=0x00010015 -Wno-unused -Wl,--allow-
> multiple-definition
>  MSFT:  *_*_IA32_ASM_FLAGS =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
>  MSFT:  *_*_IA32_CC_FLAGS  =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_DISABLE_OPTIONS)
> -D PI_SPECIFICATION_VERSION=0x00010015 -DASF_PEI
>  MSFT:  *_*_IA32_VFRPP_FLAGS   =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_DISABLE_OPTIONS)
> @@ -130,6 +131,7 @@ MSFT:  *_*_IA32_ASLCC_FLAGS   =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_D
>  # For X64 Specific Build Flag
>  #
>  GCC:   *_*_X64_PP_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> +GCC:   *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> -D PI_SPECIFICATION_VERSION=0x00010015 -Wno-unused -Wl,--allow-
> multiple-definition
>  MSFT:  *_*_X64_ASM_FLAGS  =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
>  MSFT:  *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> $(OPTIMIZE_DISABLE_OPTIONS) -D
> PI_SPECIFICATION_VERSION=0x00010015
>  MSFT:  *_*_X64_VFRPP_FLAGS=
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_DISABLE_OPTIONS)
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> index aa457e6..f1d29f7 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> @@ -24,8 +24,8 @@ PACKAGE_GUID  = D04CCA80-5F71-478D-9A26-
> 72BC751D0106
> 
>  [Includes]
>  Include
> -N1xxWU\Include
> -Features\Tbt\Include
> +N1xxWU/Include
> +Features/Tbt/Include
> 
>  [Guids]
>  gBoardModuleTokenSpaceGuid=  {0x72d1fff7, 0xa42a, 0x4219,
> {0xb9, 0x95, 0x5a, 0x67, 0x53, 0x6e, 0xa4, 0x2a}}
> --
> 2.7.4
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40973): https://edk2.groups.io/g/devel/message/40973
Mute This Topic: https://groups.io/mt/31632306/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms] [PATCH 3/5] KabylakeOpenBoardPkg: Added GCC5 build support

2019-05-17 Thread Kubacki, Michael A

Reviewed-by: Michael Kubacki 

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Agyeman, Prince
> Sent: Wednesday, May 15, 2019 10:36 AM
> To: devel@edk2.groups.io
> Cc: Agyeman, Prince 
> Subject: [edk2-devel] [edk2-platforms] [PATCH 3/5] KabylakeOpenBoardPkg:
> Added GCC5 build support
> 
> From: Prince Agyeman 
> 
> Fixed:
> * Include file paths in dec
> * Gcc build options
> 
> Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm
> version 2.11.08
> 
> Signed-off-by: Prince Agyeman 
> ---
>  .../KabylakeRvp3/OpenBoardPkgBuildOption.dsc   | 12 
>  Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec   | 14 
> --
>  2 files changed, 8 insertions(+), 18 deletions(-)
> 
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> index 318b057..19d81f7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> +++ Option.dsc
> @@ -1,15 +1,9 @@
>  ## @file
>  # platform build option configuration file.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2017 - 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.
> +#SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> @@ -108,6 +102,7 @@ DEFINE DSC_PLTPKG_FEATURE_BUILD_OPTIONS =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(  # For IA32 Specific Build Flag
> #
>  GCC:   *_*_IA32_PP_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> +GCC:   *_*_IA32_CC_FLAGS  =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) -D
> PI_SPECIFICATION_VERSION=0x00010015 -DASF_PEI -Wno-unused -Wl,--
> allow-multiple-definition
>  MSFT:  *_*_IA32_ASM_FLAGS =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
>  MSFT:  *_*_IA32_CC_FLAGS  =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_DISABLE_OPTIONS)
> -D PI_SPECIFICATION_VERSION=0x00010015 -DASF_PEI
>  MSFT:  *_*_IA32_VFRPP_FLAGS   =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_DISABLE_OPTIONS)
> @@ -130,6 +125,7 @@ MSFT:  *_*_IA32_ASLCC_FLAGS   =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_D
>  # For X64 Specific Build Flag
>  #
>  GCC:   *_*_X64_PP_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> +GCC:   *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> -D PI_SPECIFICATION_VERSION=0x00010015 -Wno-unused -Wl,--allow-
> multiple-definition
>  MSFT:  *_*_X64_ASM_FLAGS  =
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
>  MSFT:  *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
> $(OPTIMIZE_DISABLE_OPTIONS) -D
> PI_SPECIFICATION_VERSION=0x00010015
>  MSFT:  *_*_X64_VFRPP_FLAGS=
> $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_DISABLE_OPTIONS)
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> index d0fdb10..ddd8b40 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> @@ -5,15 +5,9 @@
>  # INF files to generate AutoGen.c and AutoGen.h files  # for the build
> infrastructure.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2017 - 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.
> +#SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> @@ -26,8 +20,8 @@ PACKAGE_GUID = 0A8BA6E8-C8AC-4AC1-87AC-
> 52772FA6AE5E
> 
>  [Includes]
>  Include
> -KabylakeRvp3\Include
> -Features\Tbt\Include
> +KabylakeRvp3/Include
> +Features/Tbt/Include
> 
>  [Guids]
> 
> --
> 2.7.4
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40972): https://edk2.groups.io/g/devel/message/40972
Mute This Topic: https://groups.io/mt/31632305/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms] [PATCH 5/5] Intel/Readme.md: Updated readme with linux build instructions

2019-05-17 Thread Nate DeSimone

At some point, it would be good to test this on Ubuntu 18.04 as well.

Reviewed-by: Nate DeSimone 

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Agyeman, Prince
Sent: Wednesday, May 15, 2019 10:36 AM
To: devel@edk2.groups.io
Cc: Agyeman, Prince 
Subject: [edk2-devel] [edk2-platforms] [PATCH 5/5] Intel/Readme.md: Updated 
readme with linux build instructions

From: Prince Agyeman 

Signed-off-by: Prince Agyeman 
---
 Platform/Intel/Readme.md | 31 +++
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/Platform/Intel/Readme.md b/Platform/Intel/Readme.md index 
fbf7351..972a1b0 100644
--- a/Platform/Intel/Readme.md
+++ b/Platform/Intel/Readme.md
@@ -107,9 +107,13 @@ return back to the minimum platform caller.
 
 **Building with the python script**
 
-1. Open command window, go to the workspace directory, e.g. c:\Kabylake.
-2. Type "cd edk2-platforms\Platform\Intel -3. Type "python build_bios.py -p 
REPLACE_WITH_BOARD_NAME"
+1. Open command window, go to the workspace directory, e.g. c:\Kabylake 
+or ~/Kabylake in the case of a linux OS 2. If using a linux OS
+   * Type "cd edk2"
+   * Type "source edksetup.sh"
+   * Type "cd ../" to go back to the workspace directory 3. Type "cd 
+edk2-platforms/Platform/Intel 4. Type "python build_bios.py -p 
+REPLACE_WITH_BOARD_NAME"
 
 * build_bios.py arguments:
 
@@ -132,18 +136,19 @@ return back to the minimum platform caller.
   | |
 
 * For more information on build options
-  * ``Type "python build_bios.py -h"``
+  * Type "python build_bios.py -h"
 
 * Note
-  * ``Python 2.7.16 and Python 3.7.3 compatible``
-  * ``These python build scripts have been tested on Windows due to`` 
[cross-platform limitations](#Known-limitations)
+  * Python 2.7.16 and Python 3.7.3 compatible
+  * This python build script has been tested on Windows 10 and Ubuntu 
+ 16.04.5 LTS
+  * See [cross-platform limitations](#Known-limitations)
 
 * Configuration Files
-  * ``The edk2-platforms\Platform\Intel\build.cfg file contains the default 
settings used by build_bios.py``
-  * ``The default settings are under the DEFAULT_CONFIG section``
-  * ``Each board can have a settings file that will override the 
edk2-platforms\Platform\Intel\build.cfg settings``
-  * ``An example of a board specific settings:``
-* 
``edk2-platforms\Platform\Intel\KabylakeOpenBoardPkg\KabylakeRvp3\build_config.cfg``
+  * The edk2-platforms\Platform\Intel\build.cfg file contains the 
+ default settings used by build_bios.py
+  * The default settings are under the DEFAULT_CONFIG section
+  * Each board can have a settings file that will override the 
+ edk2-platforms\Platform\Intel\build.cfg settings
+  * An example of a board specific settings:
+* 
+ edk2-platforms\Platform\Intel\KabylakeOpenBoardPkg\KabylakeRvp3\build_
+ config.cfg
 
 * Workspace view of the build scripts
   * 
@@ -212,8 +217,10 @@ Users can also flash the UEFI firmware image to the 
highest area of the flash re
 
 ### **Known limitations**
 
-* All firmware projects can only build on Windows with the validated 
configuration below.
+* All firmware projects can build on Windows with the validated configuration 
below.
   * Cross-platform build support is work-in-progress.
+* KabylakeOpenBoardPkg and ClevoOpenBoardPkg can build on Ubuntu 
+16.04.5 LTS with gcc version 5.4.0 and nasm version 2.11.08 with the 
+build_bios.py script
 
 **KabylakeOpenBoardPkg**
 1. This firmware project has only been tested on the Intel KabylakeRvp3 board.
--
2.7.4





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40971): https://edk2.groups.io/g/devel/message/40971
Mute This Topic: https://groups.io/mt/31632307/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms] [PATCH 4/5] ClevoOpenBoardPkg: Added GCC5 build support

2019-05-17 Thread Nate DeSimone

Reviewed-by: Nate DeSimone 

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Agyeman, Prince
Sent: Wednesday, May 15, 2019 10:36 AM
To: devel@edk2.groups.io
Cc: Agyeman, Prince 
Subject: [edk2-devel] [edk2-platforms] [PATCH 4/5] ClevoOpenBoardPkg: Added 
GCC5 build support

From: Prince Agyeman 

Fixes:
* include file paths
* gcc build options

Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm version 
2.11.08

Signed-off-by: Prince Agyeman 
---
 Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc | 2 ++
 Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc 
b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
index 92c7571..8d91d90 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.ds
+++ c
@@ -108,6 +108,7 @@ DEFINE DSC_PLTPKG_FEATURE_BUILD_OPTIONS = 
$(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(  # For IA32 Specific Build Flag  #
 GCC:   *_*_IA32_PP_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
+GCC:   *_*_IA32_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) -D 
PI_SPECIFICATION_VERSION=0x00010015 -Wno-unused -Wl,--allow-multiple-definition
 MSFT:  *_*_IA32_ASM_FLAGS = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
 MSFT:  *_*_IA32_CC_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS) -D PI_SPECIFICATION_VERSION=0x00010015 -DASF_PEI
 MSFT:  *_*_IA32_VFRPP_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS)
@@ -130,6 +131,7 @@ MSFT:  *_*_IA32_ASLCC_FLAGS   = 
$(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_D
 # For X64 Specific Build Flag
 #
 GCC:   *_*_X64_PP_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
+GCC:   *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) -D 
PI_SPECIFICATION_VERSION=0x00010015 -Wno-unused -Wl,--allow-multiple-definition
 MSFT:  *_*_X64_ASM_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
 MSFT:  *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS) -D PI_SPECIFICATION_VERSION=0x00010015
 MSFT:  *_*_X64_VFRPP_FLAGS= $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS)
diff --git a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec 
b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
index aa457e6..f1d29f7 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
+++ b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
@@ -24,8 +24,8 @@ PACKAGE_GUID  = D04CCA80-5F71-478D-9A26-72BC751D0106
 
 [Includes]
 Include
-N1xxWU\Include
-Features\Tbt\Include
+N1xxWU/Include
+Features/Tbt/Include
 
 [Guids]
 gBoardModuleTokenSpaceGuid=  {0x72d1fff7, 0xa42a, 0x4219, {0xb9, 
0x95, 0x5a, 0x67, 0x53, 0x6e, 0xa4, 0x2a}}
--
2.7.4





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40970): https://edk2.groups.io/g/devel/message/40970
Mute This Topic: https://groups.io/mt/31632306/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms] [PATCH 2/5] KabylakeSiliconPkg: Casting functions to EFIAPI

2019-05-17 Thread Nate DeSimone

Reviewed-by: Nate DeSimone 

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Agyeman, Prince
Sent: Wednesday, May 15, 2019 10:36 AM
To: devel@edk2.groups.io
Cc: Agyeman, Prince ; Kubacki, Michael A 
; Kinney, Michael D ; 
Desimone, Nathaniel L ; Gao, Liming 
; Sinha, Ankit 
Subject: [edk2-devel] [edk2-platforms] [PATCH 2/5] KabylakeSiliconPkg: Casting 
functions to EFIAPI

From: Prince Agyeman 

This fixes the calling convension issues in gcc

Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm version 
2.11.08

Cc: Michael Kubacki 
Cc: Michael D Kinney 
Cc: Nate DeSimone 
Cc: Liming Gao 
Cc: Ankit Sinha 

Signed-off-by: Prince Agyeman 
---
 .../Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h| 11 +++
 .../Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c| 11 +++
 .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h | 12 
 .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 12 
 4 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h 
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
index 58ef567..666340e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
@@ -1,14 +1,8 @@
 /** @file
   Header file for PCH Init SMM Handler
 
-Copyright (c) 2017, 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 
-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.
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -211,6 +205,7 @@ PchPcieLinkEqHandlerFunction (
 
 **/
 VOID
+EFIAPI
 PchPcieIoTrapSmiCallback (
   IN EFI_HANDLE DispatchHandle,
   IN EFI_SMM_IO_TRAP_CONTEXT*CallbackContext,
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c 
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
index b4234f6..847fbfb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
@@ -1,14 +1,8 @@
 /** @file
   PCH Pcie SMM Driver Entry
 
-Copyright (c) 2017, 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 
-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.
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchInitSmm.h"
@@ -244,6 +238,7 @@ PchPciePmIoTrapSmiCallback (
 
 **/
 VOID
+EFIAPI
 PchPcieIoTrapSmiCallback (
   IN  EFI_HANDLEDispatchHandle,
   IN  EFI_SMM_IO_TRAP_CONTEXT*CallbackContext,
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h 
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
index 3eebdc1..a9f0664 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
@@ -1,14 +1,8 @@
 /** @file
   Prototypes and defines for the PCH SMM Dispatcher.
 
-Copyright (c) 2017, 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 
-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.
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef PCH_SMM_H
@@ -516,6 +510,7 @@ typedef struct {
   registered and the SMI source has been 
enabled.
 **/
 EFI_STATUS
+EFIAPI
 PchSmmCoreRegister (
   IN  PCH_SMM_GENERIC_PROTOCOL  *This,
   IN  EFI_SMM_HANDLER_ENTRY_POINT2  DispatchFunction,
@@ -536,6 +531,7 @@ PchSmmCoreRegister (
   @retval EFI_INVALID_PARAMETER   Handle is invalid.
 **/
 EFI_STATUS
+EFIAPI
 PchSmmCoreUnRegister (
   IN  PCH_SMM_GENERIC_PROTOCOL

Re: [edk2-devel] [edk2-platforms] [PATCH 3/5] KabylakeOpenBoardPkg: Added GCC5 build support

2019-05-17 Thread Nate DeSimone

1. These seem like ugly hacks: -Wno-unused -Wl,--allow-multiple-definition
My guess is there are a lot of painful changes you are avoiding here... so I'll 
allow it for now.

Reviewed-by: Nate DeSimone 

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Agyeman, Prince
Sent: Wednesday, May 15, 2019 10:36 AM
To: devel@edk2.groups.io
Cc: Agyeman, Prince 
Subject: [edk2-devel] [edk2-platforms] [PATCH 3/5] KabylakeOpenBoardPkg: Added 
GCC5 build support

From: Prince Agyeman 

Fixed:
* Include file paths in dec
* Gcc build options

Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm version 
2.11.08

Signed-off-by: Prince Agyeman 
---
 .../KabylakeRvp3/OpenBoardPkgBuildOption.dsc   | 12 
 Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec   | 14 --
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git 
a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildOption.dsc 
b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildOption.dsc
index 318b057..19d81f7 100644
--- 
a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildOption.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
+++ Option.dsc
@@ -1,15 +1,9 @@
 ## @file
 # platform build option configuration file.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 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.
+#SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
@@ -108,6 +102,7 @@ DEFINE DSC_PLTPKG_FEATURE_BUILD_OPTIONS = 
$(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(  # For IA32 Specific Build Flag  #
 GCC:   *_*_IA32_PP_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
+GCC:   *_*_IA32_CC_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) -D 
PI_SPECIFICATION_VERSION=0x00010015 -DASF_PEI -Wno-unused 
-Wl,--allow-multiple-definition
 MSFT:  *_*_IA32_ASM_FLAGS = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
 MSFT:  *_*_IA32_CC_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS) -D PI_SPECIFICATION_VERSION=0x00010015 -DASF_PEI
 MSFT:  *_*_IA32_VFRPP_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS)
@@ -130,6 +125,7 @@ MSFT:  *_*_IA32_ASLCC_FLAGS   = 
$(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(OPTIMIZE_D
 # For X64 Specific Build Flag
 #
 GCC:   *_*_X64_PP_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
+GCC:   *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) -D 
PI_SPECIFICATION_VERSION=0x00010015 -Wno-unused -Wl,--allow-multiple-definition
 MSFT:  *_*_X64_ASM_FLAGS  = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS)
 MSFT:  *_*_X64_CC_FLAGS   = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS) -D PI_SPECIFICATION_VERSION=0x00010015
 MSFT:  *_*_X64_VFRPP_FLAGS= $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) 
$(OPTIMIZE_DISABLE_OPTIONS)
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec 
b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
index d0fdb10..ddd8b40 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
+++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
@@ -5,15 +5,9 @@
 # INF files to generate AutoGen.c and AutoGen.h files  # for the build 
infrastructure.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 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.
+#SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
@@ -26,8 +20,8 @@ PACKAGE_GUID = 0A8BA6E8-C8AC-4AC1-87AC-52772FA6AE5E
 
 [Includes]
 Include
-KabylakeRvp3\Include
-Features\Tbt\Include
+KabylakeRvp3/Include
+Features/Tbt/Include
 
 [Guids]
 
--
2.7.4





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40968): https://edk2.groups.io/g/devel/message/40968
Mute This Topic: https://groups.io/mt/31632305/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms] [PATCH 1/5] MinPlatformPkg: Added GCC5 build support

2019-05-17 Thread Nate DeSimone

1. RuleInclude.fdf - There are now two [Rule.Common.PEIM] sections in this 
file, which seems wrong. Please just change the one above it from PE32 to TE.

2. There is a spelling error on line 7 of Stack.nasm: Switch the stack from 
temporary memory to permenent memory.
"permenent" should be "permanent"

3. SecFspWrapperPlatformSecLib.inf - You updated the copyright year from 2017 
to 2018. You should have updated it to 2019.

4. build_bios.py - Why should the script fail if the PYTHON_HOME environment 
variable is not set? You are already running inside a Python interpreter since 
you are a Python script, if PYTHON_HOME is not set, just use sys.executable to 
get the patch of the currently running Python interpreter.

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Agyeman, Prince
Sent: Wednesday, May 15, 2019 10:36 AM
To: devel@edk2.groups.io
Cc: Agyeman, Prince ; Kubacki, Michael A 
; Kinney, Michael D ; 
Desimone, Nathaniel L ; Gao, Liming 
; Sinha, Ankit 
Subject: [edk2-devel] [edk2-platforms] [PATCH 1/5] MinPlatformPkg: Added GCC5 
build support

From: Prince Agyeman 

Fixes:
* Replacing .asm and .S with nasm in SecFspWrapperPlatformSecLib for 
cross-platform build support
* Modified RuleInclude.fdf
* Modified python files to be OS independent

Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm version 
2.11.08

Cc: Michael Kubacki 
Cc: Michael D Kinney 
Cc: Nate DeSimone 
Cc: Liming Gao 
Cc: Ankit Sinha 

TianoCore Contribution Agreement 1.1
Signed-off-by: Prince Agyeman 
---
 .../Ia32/PeiCoreEntry.S| 123 
 .../Ia32/{PeiCoreEntry.asm => PeiCoreEntry.nasm}   |  52 ++-
 .../SecFspWrapperPlatformSecLib/Ia32/SecEntry.S| 348 -
 .../Ia32/{SecEntry.asm => SecEntry.nasm}   | 138 
 .../SecFspWrapperPlatformSecLib/Ia32/Stack.S   |  73 -
 .../Ia32/{Stack.asm => Stack.nasm} |  45 ++-
 .../SecFspWrapperPlatformSecLib.inf|  18 +-
 .../MinPlatformPkg/Include/Fdf/RuleInclude.fdf |  19 +-
 .../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py   |   2 +-
 .../MinPlatformPkg/Tools/PatchFv/PatchBinFv.py |  16 +-
 .../MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py|  23 +-
 Platform/Intel/build_bios.py   |  25 +-
 12 files changed, 152 insertions(+), 730 deletions(-)  delete mode 100644 
Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
 rename 
Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/{PeiCoreEntry.asm
 => PeiCoreEntry.nasm} (59%)  delete mode 100644 
Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S
 rename 
Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/{SecEntry.asm
 => SecEntry.nasm} (69%)  delete mode 100644 
Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S
 rename 
Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/{Stack.asm
 => Stack.nasm} (50%)

diff --git 
a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
 
b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
deleted file mode 100644
index 8923577..000
--- 
a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
+++ /dev/null
@@ -1,123 +0,0 @@
-## @file
-# Find and call SecStartup
-#
-# Copyright (c) 2017, 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 -# 
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.
-#
-##
-
-ASM_GLOBAL ASM_PFX(CallPeiCoreEntryPoint)
-ASM_PFX(CallPeiCoreEntryPoint):
-  #
-  # Obtain the hob list pointer
-  #
-  movl0x4(%esp), %eax
-  #
-  # Obtain the stack information
-  #   ECX: start of range
-  #   EDX: end of range
-  #
-  movl0x8(%esp), %ecx
-  movl0xC(%esp), %edx
-
-  #
-  # Platform init
-  #
-  pushal
-  pushl %edx
-  pushl %ecx
-  pushl %eax
-  call  ASM_PFX(PlatformInit)
-  popl  %eax
-  popl  %eax
-  popl  %eax
-  popal
-
-  #
-  # Set stack top pointer
-  #
-  movl%edx, %esp
-
-  #
-  # Push the hob list pointer
-  #
-  pushl   %eax
-
-  #
-  # Save the value
-  #   ECX: start of range
-  #   EDX: end of range
-  #
-  movl%esp, %ebp
-  pushl   %ecx
-  pushl   %edx

Re: [edk2-devel] [edk2-platforms] [PATCH 1/5] MinPlatformPkg: Added GCC5 build support

2019-05-17 Thread Kubacki, Michael A

In RuleInclude.fdf this declares a duplicate Rule.Common.PEIM rule.

In this case, was there a particular reason to move from PE32 to TE? 
---
The Contributed-under tag is missing but no longer needed as V2 will be
based after the license change.

Thanks,
Michael

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Agyeman, Prince
> Sent: Wednesday, May 15, 2019 10:36 AM
> To: devel@edk2.groups.io
> Cc: Agyeman, Prince ; Kubacki, Michael A
> ; Kinney, Michael D
> ; Desimone, Nathaniel L
> ; Gao, Liming ;
> Sinha, Ankit 
> Subject: [edk2-devel] [edk2-platforms] [PATCH 1/5] MinPlatformPkg: Added
> GCC5 build support
> 
> From: Prince Agyeman 
> 
> Fixes:
> * Replacing .asm and .S with nasm in SecFspWrapperPlatformSecLib for
> cross-platform build support
> * Modified RuleInclude.fdf
> * Modified python files to be OS independent
> 
> Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm
> version 2.11.08
> 
> Cc: Michael Kubacki 
> Cc: Michael D Kinney 
> Cc: Nate DeSimone 
> Cc: Liming Gao 
> Cc: Ankit Sinha 
> 
> TianoCore Contribution Agreement 1.1
> Signed-off-by: Prince Agyeman 
> ---
>  .../Ia32/PeiCoreEntry.S| 123 
>  .../Ia32/{PeiCoreEntry.asm => PeiCoreEntry.nasm}   |  52 ++-
>  .../SecFspWrapperPlatformSecLib/Ia32/SecEntry.S| 348 
> -
>  .../Ia32/{SecEntry.asm => SecEntry.nasm}   | 138 
>  .../SecFspWrapperPlatformSecLib/Ia32/Stack.S   |  73 -
>  .../Ia32/{Stack.asm => Stack.nasm} |  45 ++-
>  .../SecFspWrapperPlatformSecLib.inf|  18 +-
>  .../MinPlatformPkg/Include/Fdf/RuleInclude.fdf |  19 +-
>  .../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py   |   2 +-
>  .../MinPlatformPkg/Tools/PatchFv/PatchBinFv.py |  16 +-
>  .../MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py|  23 +-
>  Platform/Intel/build_bios.py   |  25 +-
>  12 files changed, 152 insertions(+), 730 deletions(-)  delete mode 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.S
>  rename
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/{PeiCoreEntry.asm => PeiCoreEntry.nasm} (59%)  delete mode
> 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.S
>  rename
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/{SecEntry.asm => SecEntry.nasm} (69%)  delete mode 100644
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.S
>  rename
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/{Stack.asm => Stack.nasm} (50%)
> 
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> deleted file mode 100644
> index 8923577..000
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> +++ /dev/null
> @@ -1,123 +0,0 @@
> -## @file
> -# Find and call SecStartup
> -#
> -# Copyright (c) 2017, 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 -#
> 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.
> -#
> -##
> -
> -ASM_GLOBAL ASM_PFX(CallPeiCoreEntryPoint)
> -ASM_PFX(CallPeiCoreEntryPoint):
> -  #
> -  # Obtain the hob list pointer
> -  #
> -  movl0x4(%esp), %eax
> -  #
> -  # Obtain the stack information
> -  #   ECX: start of range
> -  #   EDX: end of range
> -  #
> -  movl0x8(%esp), %ecx
> -  movl0xC(%esp), %edx
> -
> -  #
> -  # Platform init
> -  #
> -  pushal
> -  pushl %edx
> -  pushl %ecx
> -  pushl %eax
> -  call  ASM_PFX(PlatformInit)
> -  popl  %eax
> -  popl  %eax
> -  popl  %eax
> -  popal
> -
> -  #
> -  # Set stack top pointer
> -  #
> -  movl%edx, %esp
> -
> -  #
> -  # Push the hob list pointer
> -  #
> -  pushl   %eax
> -
> -  #
> -  # Save the value
> -  #   ECX: start of range
> -  #   EDX: end of range
> -  #
> -  movl%esp, %ebp
> -  pushl   %ecx
> -  pushl   %edx
> -
> -  #
> -  # Push processor count to stack first, then BIST status (AP then BSP)
> -  #
> -  movl$1, %eax
> -  cpuid
> -  shr $16, %ebx
> -  andl$0x00FF, %ebx
> -  cmp $1, %bl
> -  jae PushProcessorCount
> -
> -  #
> -  # Some processors report 0 logical processors.  Effectively 0 = 1.
> -  # So we fix up the processor count
> -  #
> -  inc %ebx
> -
> -PushProcessorCount:

Re: [edk2-devel] [edk2-platforms] [PATCH 2/5] KabylakeSiliconPkg: Casting functions to EFIAPI

2019-05-17 Thread Kubacki, Michael A

The commit message subject line is too long.

For V2 of the series, please check the patch with PatchCheck.py before sending.

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Agyeman, Prince
> Sent: Wednesday, May 15, 2019 10:36 AM
> To: devel@edk2.groups.io
> Cc: Agyeman, Prince ; Kubacki, Michael A
> ; Kinney, Michael D
> ; Desimone, Nathaniel L
> ; Gao, Liming ;
> Sinha, Ankit 
> Subject: [edk2-devel] [edk2-platforms] [PATCH 2/5] KabylakeSiliconPkg:
> Casting functions to EFIAPI
> 
> From: Prince Agyeman 
> 
> This fixes the calling convension issues in gcc
> 
> Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm
> version 2.11.08
> 
> Cc: Michael Kubacki 
> Cc: Michael D Kinney 
> Cc: Nate DeSimone 
> Cc: Liming Gao 
> Cc: Ankit Sinha 
> 
> Signed-off-by: Prince Agyeman 
> ---
>  .../Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h| 11 +++---
> -
>  .../Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c| 11 +++--
> --
>  .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h | 12 --
> --
>  .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 12
> 
>  4 files changed, 14 insertions(+), 32 deletions(-)
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> index 58ef567..666340e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> @@ -1,14 +1,8 @@
>  /** @file
>Header file for PCH Init SMM Handler
> 
> -Copyright (c) 2017, 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 -
> 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.
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> @@ -211,6 +205,7 @@ PchPcieLinkEqHandlerFunction (
> 
>  **/
>  VOID
> +EFIAPI
>  PchPcieIoTrapSmiCallback (
>IN EFI_HANDLE DispatchHandle,
>IN EFI_SMM_IO_TRAP_CONTEXT*CallbackContext,
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> index b4234f6..847fbfb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> @@ -1,14 +1,8 @@
>  /** @file
>PCH Pcie SMM Driver Entry
> 
> -Copyright (c) 2017, 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 -
> 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.
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchInitSmm.h"
> @@ -244,6 +238,7 @@ PchPciePmIoTrapSmiCallback (
> 
>  **/
>  VOID
> +EFIAPI
>  PchPcieIoTrapSmiCallback (
>IN  EFI_HANDLEDispatchHandle,
>IN  EFI_SMM_IO_TRAP_CONTEXT*CallbackContext,
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> index 3eebdc1..a9f0664 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> @@ -1,14 +1,8 @@
>  /** @file
>Prototypes and defines for the PCH SMM Dispatcher.
> 
> -Copyright (c) 2017, 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 -
> 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.
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef PCH_SMM_H
> @@ -516,6 +510,7 @@ typedef struct {
>registered and the SMI source has been 
> enabled.
>  **/
>  EFI_STATUS
>

[edk2-devel] [Enable measured boot with SM3 digest algorithm 3/4] sm3-enabling: Add SM3 guid reference in the TPM2 hash mask structure in HashLibBaseCryptoRouterCommon.c

2019-05-17 Thread Imran Desai

---
 SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c | 
1 +
 1 file changed, 1 insertion(+)

diff --git 
a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c 
b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
index 7f3bdab53066..aec874a9e072 100644
--- 
a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
+++ 
b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
@@ -25,6 +25,7 @@ TPM2_HASH_MASK mTpm2HashMask[] = {
   {HASH_ALGORITHM_SHA256_GUID,   HASH_ALG_SHA256},
   {HASH_ALGORITHM_SHA384_GUID,   HASH_ALG_SHA384},
   {HASH_ALGORITHM_SHA512_GUID,   HASH_ALG_SHA512},
+  {HASH_ALGORITHM_SM3_256_GUID,  HASH_ALG_SM3_256},
 };
 
 /**
-- 
2.17.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40962): https://edk2.groups.io/g/devel/message/40962
Mute This Topic: https://groups.io/mt/31659815/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [Enable measured boot with SM3 digest algorithm 1/4] sm3_enabling: Augment crypt interface with calls into openssl to calculate sm3 digest prior to exercising TPM2 calls for PCR extend

2019-05-17 Thread Imran Desai

---
 OvmfPkg/OvmfPkgX64.dsc|   2 +
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf |  46 ++
 MdePkg/Include/Protocol/Hash.h|   5 +
 SecurityPkg/Include/Library/HashLib.h |   1 +
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c   | 155 

 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni |  21 +++
 6 files changed, 230 insertions(+)

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 733a4c9d8a43..7e46d401a36f 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -635,6 +635,7 @@ [Components]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -922,5 +923,6 @@ [Components]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
diff --git a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf 
b/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
new file mode 100644
index ..b2c68b784211
--- /dev/null
+++ b/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
@@ -0,0 +1,46 @@
+## @file
+#  Provides BaseCrypto SM3 hash service
+#
+#  This library can be registered to BaseCrypto router, to serve as hash 
engine.
+#
+# Copyright (c) 2013 - 2018, 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.
+#
+##
+
+[Defines]
+  INF_VERSION= 0x00010005
+  BASE_NAME  = HashInstanceLibSm3
+  MODULE_UNI_FILE= HashInstanceLibSm3.uni
+  FILE_GUID  = C5865D5D-9ACE-39FB-DC7C-0511891D40F9
+  MODULE_TYPE= BASE
+  VERSION_STRING = 1.0
+  LIBRARY_CLASS  = NULL
+  CONSTRUCTOR= HashInstanceLibSm3Constructor
+
+#
+# The following information is for reference only and not required by the 
build tools.
+#
+#  VALID_ARCHITECTURES   = IA32 X64
+#
+
+[Sources]
+  HashInstanceLibSm3.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+  SecurityPkg/SecurityPkg.dec
+  CryptoPkg/CryptoPkg.dec
+
+[LibraryClasses]
+  BaseLib
+  BaseMemoryLib
+  DebugLib
+  Tpm2CommandLib
+  MemoryAllocationLib
+  BaseCryptLib
diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h
index 931d7916ef1e..8abf1a4fa305 100644
--- a/MdePkg/Include/Protocol/Hash.h
+++ b/MdePkg/Include/Protocol/Hash.h
@@ -48,6 +48,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 0xcaa4381e, 0x750c, 0x4770, {0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 
0x30 } \
   }
 
+#define EFI_HASH_ALGORITHM_SM3_256_GUID \
+  { \
+0x251C7818, 0x0DBF, 0xE619, { 0x7F, 0xC2, 0xD6, 0xAC, 0x43, 0x42, 0x7D, 
0xA3 } \
+  }
+
 #define EFI_HASH_ALGORTIHM_MD5_GUID \
   { \
 0xaf7c79c, 0x65b5, 0x4319, {0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 
} \
diff --git a/SecurityPkg/Include/Library/HashLib.h 
b/SecurityPkg/Include/Library/HashLib.h
index 63f08398788b..24b4c425d7b8 100644
--- a/SecurityPkg/Include/Library/HashLib.h
+++ b/SecurityPkg/Include/Library/HashLib.h
@@ -137,6 +137,7 @@ EFI_STATUS
 #define HASH_ALGORITHM_SHA256_GUID  EFI_HASH_ALGORITHM_SHA256_GUID
 #define HASH_ALGORITHM_SHA384_GUID  EFI_HASH_ALGORITHM_SHA384_GUID
 #define HASH_ALGORITHM_SHA512_GUID  EFI_HASH_ALGORITHM_SHA512_GUID
+#define HASH_ALGORITHM_SM3_256_GUID  EFI_HASH_ALGORITHM_SM3_256_GUID
 
 typedef struct {
   EFI_GUID   HashGuid;
diff --git a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c 
b/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c
new file mode 100644
index ..504475ca193a
--- /dev/null
+++ b/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c
@@ -0,0 +1,155 @@
+/** @file
+  This library is BaseCrypto SM3 hash instance.
+  It can be registered to BaseCrypto router, to serve as hash engine.
+
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved. 
+This program and the accompanying materials
+are licensed and made available under

[edk2-devel] [Enable measured boot with SM3 digest algorithm 4/4] sm3-enabling: Add SM3 hashinstance library information to all OvmfPkg and SecurityPkg

2019-05-17 Thread Imran Desai

---
 OvmfPkg/OvmfPkgIa32.dsc | 2 ++
 OvmfPkg/OvmfPkgIa32X64.dsc  | 2 ++
 SecurityPkg/SecurityPkg.dsc | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 578fc6c98ec8..fb5944aa6945 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -628,6 +628,7 @@ [Components]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -914,5 +915,6 @@ [Components]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index eade8f62d3de..64c231f735c2 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -636,6 +636,7 @@ [Components.IA32]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -924,5 +925,6 @@ [Components.X64]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index a2ee0528f0d2..044319ab5e36 100644
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -222,6 +222,7 @@ [Components.IA32, Components.X64]
   SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
 
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
 
@@ -236,6 +237,7 @@ [Components.IA32, Components.X64]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 
   SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {
@@ -246,6 +248,7 @@ [Components.IA32, Components.X64]
   NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+  NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
-- 
2.17.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40963): https://edk2.groups.io/g/devel/message/40963
Mute This Topic: https://groups.io/mt/31659816/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [Enable measured boot with SM3 digest algorithm 2/4] sm3-enabling: Add SM3 TCG algorithm registry value to the PcdTpm2HashMask

2019-05-17 Thread Imran Desai

---
 SecurityPkg/SecurityPkg.dec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 3314f1854be4..fa3a4fcf5869 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -438,9 +438,10 @@ [PcdsDynamic, PcdsDynamicEx]
   #BIT1  -  SHA256.
   #BIT2  -  SHA384.
   #BIT3  -  SHA512.
+  #BIT4  -  SM3_256.
   # @Prompt Hash mask for TPM 2.0
-  # @ValidRange 0x8001 | 0x - 0x000F
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x000F|UINT32|0x00010010
+  # @ValidRange 0x8001 | 0x - 0x001F
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x001F|UINT32|0x00010010
 
   ## This PCD indicated final BIOS supported Hash mask.
   #Bios may choose to register a subset of PcdTpm2HashMask.
-- 
2.17.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40960): https://edk2.groups.io/g/devel/message/40960
Mute This Topic: https://groups.io/mt/31659813/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License

2019-05-17 Thread Michael D Kinney

Thank you to all reviewers of this series.

Pushed commit range: 54230280bb..009ff27e0b

Mike

> -Original Message-
> From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of Michael D
> Kinney
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm ; Ard
> Biesheuvel ; Gillispie, Thad
> ; Bu, Daocheng
> ; Oram, Isaac W
> ; Piwko, Maciej
> ; Chiu, Chasel
> ; Kubacki, Michael A
> ; Lu, Shifei A
> ; Zhou, Bowen
> ; Sinha, Ankit
> ; Chaganty, Rangasai V
> 
> Subject: [edk2-devel] [[edk2-platforms][PATCH V2]
> 00/30] Change edk2-platforms/master to BSD+Patent
> License
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> This change is based on the following emails:
>   https://lists.01.org/pipermail/edk2-devel/2019-
> February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-
> October/030385.html
> 
> RFCs with detailed process for the license change:
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-
> March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-
> March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-
> March/037500.html
> 
> The V2 branch for review for converting the edk2-
> platforms/master branch to
> the BSD + Patent license is available here:
> 
> https://github.com/mdkinney/edk2-
> platforms/tree/Bug_1373_BsdPatentLicense_V2
> 
> The list of commits in the series are here:
> 
> https://github.com/mdkinney/edk2-
> platforms/commits/Bug_1373_BsdPatentLicense_V2
> 
> Cc: Leif Lindholm 
> Cc: Ard Biesheuvel 
> Cc: Thad Gillispie 
> Cc: Daocheng Bu 
> Cc: Isaac W Oram 
> Cc: Maciej Piwko 
> Cc: Chasel Chiu 
> Cc: Michael Kubacki 
> Cc: Shifei A Lu 
> Cc: Xiaohu Zhou 
> Cc: Ankit Sinha 
> Cc: Sai Chaganty 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney
> 
> 
> Michael D Kinney (30):
>   edk2-platforms: Add License-History.txt
>   edk2-platforms: Change License.txt from 2-Clause BSD
> to BSD+Patent
>   Platform/96Boards: Replace BSD License with
> BSD+Patent License
>   Platform/ARM: Replace BSD License with BSD+Patent
> License
>   Platform/AMD: Replace BSD License with BSD+Patent
> License
>   Platform/Comcast: Replace BSD License with BSD+Patent
> License
>   Platform/Hisilicon: Replace BSD License with
> BSD+Patent License
>   Platform/Intel/AdvancedFeaturePkg: Replace BSD
> License with BSD+Patent
> License
>   Platform/Intel/ClevoOpenBoardPkg: Replace BSD License
> with BSD+Patent
> License
>   Platform/Intel/KabylakeOpenBoardPkg: Replace BSD
> License with
> BSD+Patent License
>   Platform/Intel/MinPlatformPkg: Replace BSD License
> with BSD+Patent
> License
>   Platform/Intel/PurleyOpenBoardPkg: Replace BSD
> License with BSD+Patent
> License
>   Platform/LeMaker: Replace BSD License with BSD+Patent
> License
>   Platform/Marvell: Replace BSD License with BSD+Patent
> License
>   Platform/RaspberryPi: Replace BSD License with
> BSD+Patent License
>   Platform/Socionext: Replace BSD License with
> BSD+Patent License
>   Platform/SoftIron: Replace BSD License with
> BSD+Patent License
>   Platform/SolidRun: Replace BSD License with
> BSD+Patent License
>   Silicon/AMD: Replace BSD License with BSD+Patent
> License
>   Silicon/Atmel: Replace BSD License with BSD+Patent
> License
>   Silicon/Broadcom: Replace BSD License with BSD+Patent
> License
>   Silicon/Hisilicon: Replace BSD License with
> BSD+Patent License
>   Silicon/Intel/KabylakeSiliconPkg: Replace BSD License
> with BSD+Patent
> License
>   Silicon/Intel/LewisburgPkg: Replace BSD License with
> BSD+Patent
> License
>   Silicon/Intel/PurleyRcPkg: Replace BSD License with
> BSD+Patent License
>   Silicon/Intel/PurleySktPkg: Replace BSD License with
> BSD+Patent
> License
>   Silicon/Marvell: Replace BSD License with BSD+Patent
> License
>   Silicon/NXP: Replace BSD License with BSD+Patent
> License
>   Silicon/Socionext: Replace BSD License with
> BSD+Patent License
>   edk2-platforms: Remove Contributions.txt and update
> Readme.md
> 
>  Contributions.txt | 235 --
> --
>  License-History.txt   | 542
> ++
>  License.txt   |  70
> ++-
>  Platform/96Boards/96Boards.dec|   8 +-
>  .../96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c  |   7 +-
>  .../96BoardsI2cDxe/96BoardsI2cDxe.inf |   8 +-
>  Platform/96Boards/Include/Guid/FormSet.h  |   8 +-
>  .../96Boards/Include/Protocol/LsConnector.h   |   8 +-
>  .../96Boards/Include/Protocol/Mezzanine.h |   8 +-
>  .../96Boards/LsConnectorDxe/LsConnectorDxe.c  |   8 +-
>  .../96Boards/LsConnectorDxe/LsConnectorDxe.h  |   8 +-
>  .../LsConnectorDxe/LsConnectorDxe.inf |   9 +-
>  .../LsConnectorDxe/LsConnectorHii.uni |   8 +-
>  .../LsConnectorDxe/LsConnectorHii.vfr |   8 +-
>  Platform/96Boards/Secure96Dxe/Secure96.asl|   9 +-
>

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt

2019-05-17 Thread Sinha, Ankit

Reviewed-by: Ankit Sinha 

-Original Message-
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Michael D 
Kinney
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Leif Lindholm ; Ard Biesheuvel 
; Gillispie, Thad ; Bu, 
Daocheng ; Oram, Isaac W ; 
Piwko, Maciej ; Chiu, Chasel ; 
Kubacki, Michael A ; Lu, Shifei A 
; Zhou, Bowen ; Sinha, Ankit 
; Chaganty, Rangasai V 
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add 
License-History.txt

Add text file that contains the history of license and contributor agreement 
changes.

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

This change is based on the following emails:

  https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
  https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html

RFCs with detailed process for the license change:

  V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
  V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
  V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

Cc: Leif Lindholm 
Cc: Ard Biesheuvel 
Cc: Thad Gillispie 
Cc: Daocheng Bu 
Cc: Isaac W Oram 
Cc: Maciej Piwko 
Cc: Chasel Chiu 
Cc: Michael Kubacki 
Cc: Shifei A Lu 
Cc: Xiaohu Zhou 
Cc: Ankit Sinha 
Cc: Sai Chaganty 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney 
---
 License-History.txt | 542 
 1 file changed, 542 insertions(+)
 create mode 100644 License-History.txt

diff --git a/License-History.txt b/License-History.txt new file mode 100644 
index 00..8ab3f67b53
--- /dev/null
+++ b/License-History.txt
@@ -0,0 +1,542 @@
+  License-History.txt
+  ===
+
+This file contains the history of license change and contributor's 
+agreement changes.
+
+Unless otherwise noted in a specific file, the EDK2 project is now 
+licensed under the terms listed in the License.txt file.  Terms under 
+which Contributions made prior to the move to the License.txt 
+formulation are shown below.  Those terms require notice of the terms 
+themselves be preserved and presented with the contributions.  This 
+file serves that preservation purpose as a matter of documenting the history 
of the project.
+
+Key Dates
+--
+* August 3, 2017
+
+  Update the TianoCore Contribution Agreement from Version 1.0  to 
+ Version 1.1 to cover open source documentation associated  with the 
+ TianoCore project.
+
+  Version 1.0 covers source code files.  Version 1.1 is a  backwards 
+ compatible extension that adds support for document  files in both 
+ source form and compiled form.
+
+  References:
+  https://opensource.org/licenses/BSD-2-Clause
+  Complete text of TianoCore Contribution Agreement 1.0 included below
+  Complete text of TianoCore Contribution Agreement 1.1 included 
+ below
+
+  Proposals (RFCs):
+  https://lists.01.org/pipermail/edk2-devel/2017-March/008654.html
+
+  TianoCore Bugzilla:
+  https://bugzilla.tianocore.org/show_bug.cgi?id=629
+
+* April 9, 2019
+
+  Replace BSD 2-Clause License with BSD + Patent License removing the 
+ need for  the TianoCore Contribution Agreement.
+
+  References:
+  https://opensource.org/licenses/BSD-2-Clause
+  Complete text of TianoCore Contribution Agreement 1.0 included below
+  Complete text of TianoCore Contribution Agreement 1.1 included below
+  https://opensource.org/licenses/BSDplusPatent
+
+  Proposals (RFCs):
+  https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
+  https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
+
+  TianoCore Bugzilla:
+  https://bugzilla.tianocore.org/show_bug.cgi?id=1373
+
+---
+-
+License.txt: BSD 2-Clause License
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: Replace BSD License with BSD+Patent License

2019-05-17 Thread Oram, Isaac W

Reviewed-by:  Isaac W Oram

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Piwko, Maciej ; Bu, Daocheng 
; Oram, Isaac W 
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 24/30] 
Silicon/Intel/LewisburgPkg: Replace BSD License with BSD+Patent License

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

Replace BSD 2-Clause License with BSD+Patent License.  This change is
based on the following emails:

  https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
  https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html

RFCs with detailed process for the license change:

  V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
  V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
  V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

Cc: Maciej Piwko 
Cc: Daocheng Bu 
Cc: Isaac W Oram 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney 
---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl| 8 +---
 .../Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf  | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl| 8 +---
 .../LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl | 8 +---
 .../Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl| 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl   | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl   | 8 +---
 .../Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl  | 8 +---
 Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl | 8 +---
 Silicon/Intel/LewisburgPkg/Include/GpioConfig.h   | 8 +---
 Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h | 8 +---
 Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h| 8 +---
 Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h  | 8 +---
 .../Intel/LewisburgPkg/Include/Library/GpioNativeLib.h| 8 +---
 .../LewisburgPkg/Include/Library/PchCycleDecodingLib.h| 8 +---
 Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h| 8 +---
 Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h   | 8 +---
 Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h   | 8 +---
 Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h| 8 +---
 Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h| 8 +---
 Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h | 8 +---
 .../Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h  | 8 +---
 .../Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h   | 8 +---
 .../LewisburgPkg/Include/Library/SpiFlashCommonLib.h  | 8 +---
 Silicon/Intel/LewisburgPkg/Include/PchAccess.h| 8 +---

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 26/30] Silicon/Intel/PurleySktPkg: Replace BSD License with BSD+Patent License

2019-05-17 Thread Oram, Isaac W

Reviewed-by:  Isaac W Oram

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Gillispie, Thad ; Bu, Daocheng 
; Oram, Isaac W 
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 26/30] 
Silicon/Intel/PurleySktPkg: Replace BSD License with BSD+Patent License

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

Replace BSD 2-Clause License with BSD+Patent License.  This change is based on 
the following emails:

  https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
  https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html

RFCs with detailed process for the license change:

  V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
  V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
  V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

Cc: Thad Gillispie 
Cc: Daocheng Bu 
Cc: Isaac W Oram 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney 
---
 .../Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h   | 8 +---
 .../Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h| 8 +---
 Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h   | 8 +---
 .../Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h   | 8 +---
 .../Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h  | 8 +---
 .../PurleySktPkg/Include/Guid/SocketCommonRcVariable.h| 8 +---
 .../Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h   | 8 +---
 .../PurleySktPkg/Include/Guid/SocketMemoryVariable.h  | 8 +---
 .../PurleySktPkg/Include/Guid/SocketMpLinkVariable.h  | 8 +---
 .../PurleySktPkg/Include/Guid/SocketPciResourceData.h | 8 +---
 .../Include/Guid/SocketPowermanagementVariable.h  | 8 +---
 .../Include/Guid/SocketProcessorCoreVariable.h| 8 +---
 Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h  | 8 +---
 Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h| 8 +---
 Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h  | 8 +---
 Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h | 8 +---  
Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h  | 8 +---  
Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h | 8 +---
 .../Library/CsrToPcieLib/CpuCsrAccessDefine.h | 8 +---
 .../PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf | 8 +---
 .../PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c  | 8 +---
 .../PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf | 8 +---  
.../PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c  | 8 +---
 .../Library/PcieAddressLib/PcieAddressLib.inf | 8 +---
 .../Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c  | 8 +---  
.../Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h | 8 +---
 .../Library/ProcMemInit/Chip/Include/CpuPciAccess.h   | 8 +---
 .../Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h | 8 +---
 .../Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec| 8 +---
 .../IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h   | 8 +---
 .../Include/Protocol/IntelCpuPcdsSetDone.h| 8 +---
 Silicon/Intel/PurleySktPkg/SktCommonLib.dsc   | 8 +---
 Silicon/Intel/PurleySktPkg/SktDxeLib.dsc  | 8 +---
 Silicon/Intel/PurleySktPkg/SktPeiLib.dsc  | 8 +---
 Silicon/Intel/PurleySktPkg/SocketPkg.dec  | 8 +---
 35 files changed, 35 insertions(+), 245 deletions(-)

diff --git a/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h 
b/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
index b4a2639219..0a8d3064c3 100644
--- a/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
+++ b/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
@@ -1,13 +1,7 @@
 /** @file
 
 Copyright (c) 2018, 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 
-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.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h 
b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
index 5102ba7a8f..f7c57af8a5 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
@@ -1,13 +1,7 @@
 /** @file
 
 Copyright (c) 2018, Intel Corporation. All rights reserved. -This program 
and the accompanying materials are licensed and made available under -the

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 25/30] Silicon/Intel/PurleyRcPkg: Replace BSD License with BSD+Patent License

2019-05-17 Thread Oram, Isaac W

Reviewed-by:  Isaac W Oram

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Gillispie, Thad ; Bu, Daocheng 
; Oram, Isaac W 
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 25/30] 
Silicon/Intel/PurleyRcPkg: Replace BSD License with BSD+Patent License

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

Replace BSD 2-Clause License with BSD+Patent License.  This change is
based on the following emails:

  https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
  https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html

RFCs with detailed process for the license change:

  V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
  V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
  V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

Cc: Thad Gillispie 
Cc: Daocheng Bu 
Cc: Isaac W Oram 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney 
---
 .../Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h  | 8 +---
 Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h  | 8 +---
 Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h   | 8 +---
 .../PurleyRcPkg/Include/Library/PciePlatformHookLib.h | 8 +---
 Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h | 8 +---
 Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h | 8 +---
 Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h  | 8 +---
 .../Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h | 8 +---
 Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h| 8 +---
 .../BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h| 8 +---
 .../Chip/Skx/Include/Iio/IioPlatformData.h| 8 +---
 .../BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h  | 8 +---
 .../Chip/Skx/Include/Iio/IioSetupDefinitions.h| 8 +---
 .../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h  | 8 +---
 .../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h  | 8 +---
 .../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h| 8 +---
 .../Chip/Skx/Include/Protocol/CpuCsrAccess.h  | 8 +---
 .../Chip/Skx/Include/Setup/IioUniversalData.h | 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/CpuHost.h  | 8 +---
 .../BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h | 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/DataTypes.h| 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/MemHost.h  | 8 +---
 .../BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h| 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/MemRegs.h  | 8 +---
 .../BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h   | 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h  | 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/Printf.h   | 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/SysHost.h  | 8 +---
 .../BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h| 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/SysRegs.h  | 8 +---
 .../Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h | 8 +---
 .../Platform/Purley/Include/MemDefaults.h | 8 +---
 .../Platform/Purley/Include/MemPlatform.h | 8 +---
 .../Platform/Purley/Include/PlatformHost.h| 8 +---
 .../Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf | 8 +---
 .../PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c   | 8 +---
 .../PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c | 8 +---
 .../Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf   | 8 +---
 .../PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c | 8 +---
 .../Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf   | 8 +---
 .../Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c | 8 +---
 .../PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf | 8 +---
 .../PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c   | 8 +---
 .../PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf | 8 +---
 .../Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c   | 8 +---
 .../Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c  | 8 +---
 .../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c | 8 +---
 .../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h | 8 +---
 .../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf   | 8 +---
 Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc | 8 +---
 Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc| 8 +---
 Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc| 8 +---
 Silicon/Intel/PurleyRcPkg/RcPkg.dec   | 8 +---
 53 files changed, 53 insertions(+), 371 deletions(-)

diff --git

Re: [edk2-devel] [PATCH] EmbeddedPkg/PrePiLib: remove dead status code reporting code

2019-05-17 Thread Leif Lindholm

On Fri, May 17, 2019 at 06:18:55PM +0200, Ard Biesheuvel wrote:
> The status code reporting functionality in PrePiLib is never invoked
> so let's just remove it.
> 
> Signed-off-by: Ard Biesheuvel 

Reviewed-by: Leif Lindholm 

*however* - I don't think this constitutes a bugfix, so probably needs
to hold back until stable tag is made.

/
Leif

> ---
>  EmbeddedPkg/Include/Library/PrePiLib.h  |   7 -
>  EmbeddedPkg/Library/PrePiLib/PrePiLib.inf   |   4 -
>  EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c | 318 
>  3 files changed, 329 deletions(-)
> 
> diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h 
> b/EmbeddedPkg/Include/Library/PrePiLib.h
> index 787678844093..ee8d4ef4d98a 100644
> --- a/EmbeddedPkg/Include/Library/PrePiLib.h
> +++ b/EmbeddedPkg/Include/Library/PrePiLib.h
> @@ -755,11 +755,4 @@ DecompressFirstFv (
>VOID
>);
>  
> -VOID
> -EFIAPI
> -AddDxeCoreReportStatusCodeCallback (
> -  VOID
> -  );
> -
> -
>  #endif
> diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf 
> b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
> index bdedb8d666df..83a0edcb8d94 100644
> --- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
> +++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
> @@ -29,7 +29,6 @@
>  [Sources.common]
>FwVol.c
>PrePiLib.c
> -  ReportStatusCode.c
>  
>  [Packages]
>MdePkg/MdePkg.dec
> @@ -51,12 +50,9 @@
>HobLib
>  
>  [Guids]
> -  gEfiStatusCodeSpecificDataGuid
>gEfiMemoryTypeInformationGuid
> -  gEfiStatusCodeDataTypeDebugGuid
>  
>  [Protocols]
> -  gEfiStatusCodeRuntimeProtocolGuid
>gPeCoffLoaderProtocolGuid
>  
>  
> diff --git a/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c 
> b/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c
> deleted file mode 100644
> index 043cf5e9cd23..
> --- a/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c
> +++ /dev/null
> @@ -1,318 +0,0 @@
> -/** @file
> -  Library that helps implement monolithic PEI
> -
> -  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
> -
> -  SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -#include 
> -#include 
> -#include 
> -#include 
> -
> -#include 
> -#include 
> -#include 
> -
> -EFI_STATUS
> -EFIAPI
> -SerialReportStatusCode (
> -  IN EFI_STATUS_CODE_TYPE CodeType,
> -  IN EFI_STATUS_CODE_VALUEValue,
> -  IN UINT32   Instance,
> -  IN CONST EFI_GUID   *CallerId,
> -  IN CONST EFI_STATUS_CODE_DATA   *Data OPTIONAL
> -  );
> -
> -
> -EFI_STATUS_CODE_PROTOCOL gStatusCode = {
> -  (EFI_REPORT_STATUS_CODE)SerialReportStatusCode
> -};
> -
> -/**
> -  Extracts ASSERT() information from a status code structure.
> -
> -  Converts the status code specified by CodeType, Value, and Data to the 
> ASSERT()
> -  arguments specified by Filename, Description, and LineNumber.  If CodeType 
> is
> -  an EFI_ERROR_CODE, and CodeType has a severity of EFI_ERROR_UNRECOVERED, 
> and
> -  Value has an operation mask of EFI_SW_EC_ILLEGAL_SOFTWARE_STATE, extract
> -  Filename, Description, and LineNumber from the optional data area of the
> -  status code buffer specified by Data.  The optional data area of Data 
> contains
> -  a Null-terminated ASCII string for the FileName, followed by a 
> Null-terminated
> -  ASCII string for the Description, followed by a 32-bit LineNumber.  If the
> -  ASSERT() information could be extracted from Data, then return TRUE.
> -  Otherwise, FALSE is returned.
> -
> -  If Data is NULL, then ASSERT().
> -  If Filename is NULL, then ASSERT().
> -  If Description is NULL, then ASSERT().
> -  If LineNumber is NULL, then ASSERT().
> -
> -  @param  CodeType The type of status code being converted.
> -  @param  ValueThe status code value being converted.
> -  @param  Data Pointer to status code data buffer.
> -  @param  Filename Pointer to the source file name that generated the 
> ASSERT().
> -  @param  Description  Pointer to the description of the ASSERT().
> -  @param  LineNumber   Pointer to source line number that generated the 
> ASSERT().
> -
> -  @retval  TRUE   The status code specified by CodeType, Value, and Data was
> -  converted ASSERT() arguments specified by Filename, 
> Description,
> -  and LineNumber.
> -  @retval  FALSE  The status code specified by CodeType, Value, and Data 
> could
> -  not be converted to ASSERT() arguments.
> -
> -**/
> -BOOLEAN
> -EFIAPI
> -ReportStatusCodeExtractAssertInfo (
> -  IN EFI_STATUS_CODE_TYPECodeType,
> -  IN EFI_STATUS_CODE_VALUE   Value,
> -  IN CONST EFI_STATUS_CODE_DATA  *Data,
> -  OUT CHAR8  **Filename,
> -  OUT CHAR8  **Description,
> -  OUT UINT32 *LineNumber
> -  )
> -{
> -  EFI_DEBUG_ASSERT_DATA  *AssertData;
> -
> -  ASSERT (Data!= NULL);
> -  ASSERT (Filename!= NULL);
> -  ASSERT (Description != NULL);
> -  ASSERT (LineNumber  != NULL);
> -
> -

Re: [edk2-devel] [edk2-platforms: PATCH] Marvell/Armada7k8k: Introduce SMBIOS/DMI support

2019-05-17 Thread Leif Lindholm

On Fri, May 17, 2019 at 09:58:27AM +0200, Marcin Wojtas wrote:
> Fill in the basic requirements of the SMBIOS specification by specifying
> the minimum required structures. The basic fixup is performed.
> CPU/DRAM frequency is obtained via SampleAtResetlib and the DRAM size
> is calculated from the information stored in the HOB list.
> 
> Add new Armada SmbiosPlatformDxe and MdeModulePkg/SmbiosDxe to the
> build and firmware image. With these changes, the EFI BDS, EFI shell,
> and Linux dmidecode command return useful information.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas 
> ---
> Hi,
> 
> I push the support as a single patch. I plan to add more detailed
> fixup, using BoardDescProtocol, but I'll add it after PCIE is merged.

Yes, I think this is a good approach.

> In order to ease review, the patch is available in the github:
> https://github.com/MarvellEmbeddedProcessors/edk2-open-platform/commits/smbios-upstream-r20190517
> 
> Looking forward to your comments.
> 
> Best regards,
> Marcin
> 
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc   |   9 +
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf   |   4 +
>  Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf |  60 ++
>  Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c   | 787 
> 
>  4 files changed, 860 insertions(+)
>  create mode 100644 
> Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>  create mode 100644 
> Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> 
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc 
> b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 3c685b3..0c13045 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -395,6 +395,11 @@
>gMarvellTokenSpaceGuid.PcdOpTeeRegionBase|0x440
>gMarvellTokenSpaceGuid.PcdOpTeeRegionSize|0x100
>  
> +  # SMBIOS/DMI
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0300

Nothing wrong with this, but current SMBIOS revision is 3.2, and
definitions for it are already in EDK2, so it could make sense for a
new implementation to use that version.

> +
># TRNG
>gMarvellTokenSpaceGuid.PcdEip76TrngBaseAddress|0xF276
>  
> @@ -619,6 +624,10 @@
>ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  !endif #$(INCLUDE_TFTP_COMMAND)
>  
> +  # SMBIOS/DMI
> +  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> +  Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
> +
>  [Components.AARCH64]
>#
># Generic ACPI modules
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf 
> b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index 2f4b810..1fbc744 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -221,6 +221,10 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
># DTB
>INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
>  
> +  # SMBIOS/DMI
> +  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> +  INF Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
> +
>  !if $(ARCH) == AARCH64
># ACPI support
>INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
> diff --git a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf 
> b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
> new file mode 100644
> index 000..b81cac9
> --- /dev/null
> +++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
> @@ -0,0 +1,60 @@
> +#/** @file
> +#  SMBIOS Table for ARM platform
> +#
> +#  Copyright (c) 2013, Linaro Ltd. All rights reserved.
> +#  Copyright (c) 2018, Marvell International Ltd. and its affiliates

-2019?

> +#
> +#  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.
> +#
> +#**/
> +
> +[Defines]
> +  INF_VERSION= 0x0001001B
> +  BASE_NAME  = SmbiosPlatformDxe
> +  FILE_GUID  = 1c5028a4-3bd0-43cf-9e56-b450584dc22b
> +  MODULE_TYPE= DXE_DRIVER
> +  VERSION_STRING = 1.0
> +  ENTRY_POINT= SmbiosPlatformDriverEntryPoint
> +
> +[Sources]
> +  SmbiosPlatformDxe.c
> +
> +[Packages]
> +  ArmPkg/ArmPkg.dec
> +  ArmPlatformPkg/ArmPlatformPkg.dec
> +  MdeModulePkg/MdeModulePkg.dec
> +  MdePkg/MdePkg.dec
> +  Silicon/Marvell/Marvell.dec
>

[edk2-devel] [PATCH] EmbeddedPkg/PrePiLib: remove dead status code reporting code

2019-05-17 Thread Ard Biesheuvel

The status code reporting functionality in PrePiLib is never invoked
so let's just remove it.

Signed-off-by: Ard Biesheuvel 
---
 EmbeddedPkg/Include/Library/PrePiLib.h  |   7 -
 EmbeddedPkg/Library/PrePiLib/PrePiLib.inf   |   4 -
 EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c | 318 
 3 files changed, 329 deletions(-)

diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h 
b/EmbeddedPkg/Include/Library/PrePiLib.h
index 787678844093..ee8d4ef4d98a 100644
--- a/EmbeddedPkg/Include/Library/PrePiLib.h
+++ b/EmbeddedPkg/Include/Library/PrePiLib.h
@@ -755,11 +755,4 @@ DecompressFirstFv (
   VOID
   );
 
-VOID
-EFIAPI
-AddDxeCoreReportStatusCodeCallback (
-  VOID
-  );
-
-
 #endif
diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf 
b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
index bdedb8d666df..83a0edcb8d94 100644
--- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
+++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf
@@ -29,7 +29,6 @@
 [Sources.common]
   FwVol.c
   PrePiLib.c
-  ReportStatusCode.c
 
 [Packages]
   MdePkg/MdePkg.dec
@@ -51,12 +50,9 @@
   HobLib
 
 [Guids]
-  gEfiStatusCodeSpecificDataGuid
   gEfiMemoryTypeInformationGuid
-  gEfiStatusCodeDataTypeDebugGuid
 
 [Protocols]
-  gEfiStatusCodeRuntimeProtocolGuid
   gPeCoffLoaderProtocolGuid
 
 
diff --git a/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c 
b/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c
deleted file mode 100644
index 043cf5e9cd23..
--- a/EmbeddedPkg/Library/PrePiLib/ReportStatusCode.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/** @file
-  Library that helps implement monolithic PEI
-
-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-
-  SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-EFI_STATUS
-EFIAPI
-SerialReportStatusCode (
-  IN EFI_STATUS_CODE_TYPE CodeType,
-  IN EFI_STATUS_CODE_VALUEValue,
-  IN UINT32   Instance,
-  IN CONST EFI_GUID   *CallerId,
-  IN CONST EFI_STATUS_CODE_DATA   *Data OPTIONAL
-  );
-
-
-EFI_STATUS_CODE_PROTOCOL gStatusCode = {
-  (EFI_REPORT_STATUS_CODE)SerialReportStatusCode
-};
-
-/**
-  Extracts ASSERT() information from a status code structure.
-
-  Converts the status code specified by CodeType, Value, and Data to the 
ASSERT()
-  arguments specified by Filename, Description, and LineNumber.  If CodeType is
-  an EFI_ERROR_CODE, and CodeType has a severity of EFI_ERROR_UNRECOVERED, and
-  Value has an operation mask of EFI_SW_EC_ILLEGAL_SOFTWARE_STATE, extract
-  Filename, Description, and LineNumber from the optional data area of the
-  status code buffer specified by Data.  The optional data area of Data 
contains
-  a Null-terminated ASCII string for the FileName, followed by a 
Null-terminated
-  ASCII string for the Description, followed by a 32-bit LineNumber.  If the
-  ASSERT() information could be extracted from Data, then return TRUE.
-  Otherwise, FALSE is returned.
-
-  If Data is NULL, then ASSERT().
-  If Filename is NULL, then ASSERT().
-  If Description is NULL, then ASSERT().
-  If LineNumber is NULL, then ASSERT().
-
-  @param  CodeType The type of status code being converted.
-  @param  ValueThe status code value being converted.
-  @param  Data Pointer to status code data buffer.
-  @param  Filename Pointer to the source file name that generated the 
ASSERT().
-  @param  Description  Pointer to the description of the ASSERT().
-  @param  LineNumber   Pointer to source line number that generated the 
ASSERT().
-
-  @retval  TRUE   The status code specified by CodeType, Value, and Data was
-  converted ASSERT() arguments specified by Filename, 
Description,
-  and LineNumber.
-  @retval  FALSE  The status code specified by CodeType, Value, and Data could
-  not be converted to ASSERT() arguments.
-
-**/
-BOOLEAN
-EFIAPI
-ReportStatusCodeExtractAssertInfo (
-  IN EFI_STATUS_CODE_TYPECodeType,
-  IN EFI_STATUS_CODE_VALUE   Value,
-  IN CONST EFI_STATUS_CODE_DATA  *Data,
-  OUT CHAR8  **Filename,
-  OUT CHAR8  **Description,
-  OUT UINT32 *LineNumber
-  )
-{
-  EFI_DEBUG_ASSERT_DATA  *AssertData;
-
-  ASSERT (Data!= NULL);
-  ASSERT (Filename!= NULL);
-  ASSERT (Description != NULL);
-  ASSERT (LineNumber  != NULL);
-
-  if (((CodeType & EFI_STATUS_CODE_TYPE_MASK)  == EFI_ERROR_CODE) &&
-  ((CodeType & EFI_STATUS_CODE_SEVERITY_MASK)  == EFI_ERROR_UNRECOVERED) &&
-  ((Value& EFI_STATUS_CODE_OPERATION_MASK) == 
EFI_SW_EC_ILLEGAL_SOFTWARE_STATE)) {
-AssertData   = (EFI_DEBUG_ASSERT_DATA *)(Data + 1);
-*Filename= (CHAR8 *)(AssertData + 1);
-*Description = *Filename + AsciiStrLen (*Filename) + 1;
-*LineNumber  = AssertData->LineNumber;
-return TRUE;
-  }
-  return FALSE;
-}
-
-
-/**
-  Extracts DEBUG()

Re: [edk2-devel] [edk2-platforms][PATCH v1 02/16] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

(adding Andrew)

On Fri, 17 May 2019 at 18:05, Ard Biesheuvel  wrote:
>
> On Fri, 17 May 2019 at 18:03, Leif Lindholm  wrote:
> >
> > On Fri, May 17, 2019 at 05:24:36PM +0200, Ard Biesheuvel wrote:
> > > On Tue, 14 May 2019 at 04:08, Wu, Hao A  wrote:
> > > >
> > > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> > > >
> > > > This commit will update the DSC file to consume the ReportStatusCodeLib
> > > > (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> > > > one in IntelFrameworkModulePkg.
> > > >
> > > > Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> > > > almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> > > > there is no functional impact for this commit.
> > > >
> > > > Cc: Ard Biesheuvel 
> > > > Cc: Leif Lindholm 
> > > > Cc: Michael D Kinney 
> > > > Signed-off-by: Hao A Wu 
> > >
> > > This platform does not have a status code router, so should we not
> > > simply switch to BaseReportStatusCodeLibNull.inf here?
> >
> > Err, yeah, good point. Slight case of tunnel vision.
> >
>
> Actually, I only just figured out that PrePiLib *does* have a status
> code router.
>
> This is slightly dodgy (as is PrePi in general) since it uses a HOB to
> expose function pointers into the SEC module, but from the protocol
> client pov, it is just a status code router as any other.
>
> Note that my comment still applies to other platforms that don't use
> PrePi (the Styx ones)

... it is not entirely clear to me though how the GUID hobs
representing protocol GUIDs get installed into the protocol database.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40948): https://edk2.groups.io/g/devel/message/40948
Mute This Topic: https://groups.io/mt/31614323/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 02/16] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Fri, 17 May 2019 at 18:03, Leif Lindholm  wrote:
>
> On Fri, May 17, 2019 at 05:24:36PM +0200, Ard Biesheuvel wrote:
> > On Tue, 14 May 2019 at 04:08, Wu, Hao A  wrote:
> > >
> > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> > >
> > > This commit will update the DSC file to consume the ReportStatusCodeLib
> > > (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> > > one in IntelFrameworkModulePkg.
> > >
> > > Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> > > almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> > > there is no functional impact for this commit.
> > >
> > > Cc: Ard Biesheuvel 
> > > Cc: Leif Lindholm 
> > > Cc: Michael D Kinney 
> > > Signed-off-by: Hao A Wu 
> >
> > This platform does not have a status code router, so should we not
> > simply switch to BaseReportStatusCodeLibNull.inf here?
>
> Err, yeah, good point. Slight case of tunnel vision.
>

Actually, I only just figured out that PrePiLib *does* have a status
code router.

This is slightly dodgy (as is PrePi in general) since it uses a HOB to
expose function pointers into the SEC module, but from the protocol
client pov, it is just a status code router as any other.

Note that my comment still applies to other platforms that don't use
PrePi (the Styx ones)

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40947): https://edk2.groups.io/g/devel/message/40947
Mute This Topic: https://groups.io/mt/31614323/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 16/16] Platform/SoftIron: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Leif Lindholm

On Fri, May 17, 2019 at 05:46:29PM +0200, Ard Biesheuvel wrote:
> On Tue, 14 May 2019 at 04:09, Hao A Wu  wrote:
> >
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> >
> > This commit will update the DSC file to consume the ReportStatusCodeLib
> > (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> > one in IntelFrameworkModulePkg.
> >
> > Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> > almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> > there is no functional impact for this commit.
> >
> > Cc: Ard Biesheuvel 
> > Cc: Leif Lindholm 
> > Cc: Michael D Kinney 
> > Signed-off-by: Hao A Wu 
> 
> This platform does not have a status code router, so should we not
> simply switch to BaseReportStatusCodeLibNull.inf here?

And again, yes.

/
Leif

> > ---
> >  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 8 
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc 
> > b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> > index 6243d35ee6..a40cb6623f 100644
> > --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> > +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> > @@ -193,12 +193,12 @@ DEFINE NUM_CORES= 4
> >HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
> >
> > MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
> >DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
> >
> >  [LibraryClasses.common.DXE_DRIVER]
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >
> > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> > @@ -207,7 +207,7 @@ DEFINE NUM_CORES= 4
> >  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
> >HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> >
> > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
> >CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> >  !if $(TARGET) != RELEASE
> >
> > DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
> > @@ -220,7 +220,7 @@ DEFINE NUM_CORES= 4
> >
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> >  [LibraryClasses.common.UEFI_DRIVER]
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >
> > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> > --
> > 2.12.0.windows.1
> >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40946): https://edk2.groups.io/g/devel/message/40946
Mute This Topic: https://groups.io/mt/31614337/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 14/16] Platform/LeMaker: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Leif Lindholm

On Fri, May 17, 2019 at 05:45:09PM +0200, Ard Biesheuvel wrote:
> On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
> >
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> >
> > This commit will update the DSC file to consume the ReportStatusCodeLib
> > (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> > one in IntelFrameworkModulePkg.
> >
> > Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> > almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> > there is no functional impact for this commit.
> >
> > Cc: Ard Biesheuvel 
> > Cc: Leif Lindholm 
> > Cc: Michael D Kinney 
> > Signed-off-by: Hao A Wu 
> 
> This platform does not have a status code router, so should we not
> simply switch to BaseReportStatusCodeLibNull.inf here?

Yeah.

/
Leif

> > ---
> >  Platform/LeMaker/CelloBoard/CelloBoard.dsc | 8 
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc 
> > b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> > index bb68763743..1eec89e088 100644
> > --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> > @@ -194,12 +194,12 @@ DEFINE NUM_CORES= 4
> >HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
> >
> > MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
> >DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
> >
> >  [LibraryClasses.common.DXE_DRIVER]
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >
> > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> > @@ -208,7 +208,7 @@ DEFINE NUM_CORES= 4
> >  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
> >HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> >
> > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
> >CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> >  !if $(TARGET) != RELEASE
> >
> > DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
> > @@ -221,7 +221,7 @@ DEFINE NUM_CORES= 4
> >
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> >  [LibraryClasses.common.UEFI_DRIVER]
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >
> > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> > --
> > 2.12.0.windows.1
> >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40945): https://edk2.groups.io/g/devel/message/40945
Mute This Topic: https://groups.io/mt/31614335/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 02/16] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Leif Lindholm

On Fri, May 17, 2019 at 05:24:36PM +0200, Ard Biesheuvel wrote:
> On Tue, 14 May 2019 at 04:08, Wu, Hao A  wrote:
> >
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> >
> > This commit will update the DSC file to consume the ReportStatusCodeLib
> > (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> > one in IntelFrameworkModulePkg.
> >
> > Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> > almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> > there is no functional impact for this commit.
> >
> > Cc: Ard Biesheuvel 
> > Cc: Leif Lindholm 
> > Cc: Michael D Kinney 
> > Signed-off-by: Hao A Wu 
> 
> This platform does not have a status code router, so should we not
> simply switch to BaseReportStatusCodeLibNull.inf here?

Err, yeah, good point. Slight case of tunnel vision.

/
Leif

> > ---
> >  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 10 +-
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc 
> > b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> > index 2d5d6f9977..8e8bb833ea 100644
> > --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> > +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> > @@ -163,7 +163,7 @@
> >HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
> >
> > MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
> >DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> >  #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
> > @@ -173,19 +173,19 @@
> >
> >
> >  [LibraryClasses.common.DXE_DRIVER]
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> >
> > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >
> > NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
> >
> >  [LibraryClasses.common.UEFI_APPLICATION]
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >
> >  [LibraryClasses.common.UEFI_DRIVER]
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> >
> > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> >
> > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
> >DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> > @@ -193,7 +193,7 @@
> >  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
> >HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> >
> > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> > -  
> > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> > +  
> > ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
> >CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> >  #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
> >PeCoffLib|BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
> > --
> > 2.12.0.windows.1
> >
> >
> > 
> >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40944): https://edk2.groups.io/g/devel/message/40944
Mute This Topic: https://groups.io/mt/31614323/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

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

2019-05-17 Thread Ard Biesheuvel

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

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

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

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40943): https://edk2.groups.io/g/devel/message/40943
Mute This Topic: https://groups.io/mt/31616098/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

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

2019-05-17 Thread Ard Biesheuvel

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

Can we use the NULL status code library here?

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

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40942): https://edk2.groups.io/g/devel/message/40942
Mute This Topic: https://groups.io/mt/31616098/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 16/16] Platform/SoftIron: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:09, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC file to consume the ReportStatusCodeLib
> (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> one in IntelFrameworkModulePkg.
>
> Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> there is no functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

This platform does not have a status code router, so should we not
simply switch to BaseReportStatusCodeLibNull.inf here?


> ---
>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc 
> b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> index 6243d35ee6..a40cb6623f 100644
> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> @@ -193,12 +193,12 @@ DEFINE NUM_CORES= 4
>HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
>
> MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
>DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>
> PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
>
>  [LibraryClasses.common.DXE_DRIVER]
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> @@ -207,7 +207,7 @@ DEFINE NUM_CORES= 4
>  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
>CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
>  !if $(TARGET) != RELEASE
>
> DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
> @@ -220,7 +220,7 @@ DEFINE NUM_CORES= 4
>
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
>  [LibraryClasses.common.UEFI_DRIVER]
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40941): https://edk2.groups.io/g/devel/message/40941
Mute This Topic: https://groups.io/mt/31614337/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 15/16] Platform/SoftIron: Use Lzma decompress lib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC file to consume the LzmaDecompressLib in
> MdeModulePkg, instead of using the one in IntelFrameworkModulePkg.
>
> Please note that, the 2 LzmaDecompressLib are identical. Thus, there is no
> functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc 
> b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> index cc4f2facd0..6243d35ee6 100644
> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> @@ -461,7 +461,7 @@ DEFINE NUM_CORES= 4
>MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
>MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
>  
> -  
> NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +  
> NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>}
>
>#
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40940): https://edk2.groups.io/g/devel/message/40940
Mute This Topic: https://groups.io/mt/31614336/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 14/16] Platform/LeMaker: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC file to consume the ReportStatusCodeLib
> (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> one in IntelFrameworkModulePkg.
>
> Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> there is no functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

This platform does not have a status code router, so should we not
simply switch to BaseReportStatusCodeLibNull.inf here?

> ---
>  Platform/LeMaker/CelloBoard/CelloBoard.dsc | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc 
> b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> index bb68763743..1eec89e088 100644
> --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> @@ -194,12 +194,12 @@ DEFINE NUM_CORES= 4
>HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
>
> MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
>DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>
> PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
>
>  [LibraryClasses.common.DXE_DRIVER]
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> @@ -208,7 +208,7 @@ DEFINE NUM_CORES= 4
>  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
>CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
>  !if $(TARGET) != RELEASE
>
> DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
> @@ -221,7 +221,7 @@ DEFINE NUM_CORES= 4
>
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
>  [LibraryClasses.common.UEFI_DRIVER]
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40939): https://edk2.groups.io/g/devel/message/40939
Mute This Topic: https://groups.io/mt/31614335/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 13/16] Platform/LeMaker: Use Lzma decompress lib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC file to consume the LzmaDecompressLib in
> MdeModulePkg, instead of using the one in IntelFrameworkModulePkg.
>
> Please note that, the 2 LzmaDecompressLib are identical. Thus, there is no
> functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Platform/LeMaker/CelloBoard/CelloBoard.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc 
> b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> index bc2f3e2076..bb68763743 100644
> --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> @@ -475,7 +475,7 @@ DEFINE NUM_CORES= 4
>MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
>MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
>  
> -  
> NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +  
> NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>}
>
>#
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40938): https://edk2.groups.io/g/devel/message/40938
Mute This Topic: https://groups.io/mt/31614334/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 12/16] Silicon/Hisilicon/PlatformIntelBdsLib: Remove Hisilicon PlatformBdsLib

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> Hisilicon platforms have already switched to the BDS driver in
> MdeModulePkg by commit 5845a5cde9d6bd51d77067b2594654005887a434.
>
> Thus, the Hisilicon PlatformBdsLib is no longer needed. This commit will
> remove this library instance implementation.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf  |  84 
> --
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h   |  61 
> --
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h |  27 
> -
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c   | 963 
> 
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c | 118 
> ---
>  5 files changed, 1253 deletions(-)
>
> diff --git 
> a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf 
> b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
> deleted file mode 100644
> index 0feec06392..00
> --- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
> +++ /dev/null
> @@ -1,84 +0,0 @@
> -## @file
> -#  Implementation for PlatformBdsLib library class interfaces.
> -#
> -#  Copyright (C) 2015, Red Hat, Inc.
> -#  Copyright (c) 2014, ARM Ltd. All rights reserved.
> -#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
> -#  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> -#  Copyright (c) 2015, Linaro Limited. 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.
> -#
> -#  Based on the files under ArmVirtPkg/Library/PlatformIntelBdsLib/
> -#
> -##
> -
> -[Defines]
> -  INF_VERSION= 0x00010005
> -  BASE_NAME  = PlatformIntelBdsLib
> -  FILE_GUID  = 46DF84EB-F603-4D39-99D8-E1E86B50BCC2
> -  MODULE_TYPE= DXE_DRIVER
> -  VERSION_STRING = 1.0
> -  LIBRARY_CLASS  = PlatformBdsLib|DXE_DRIVER
> -
> -#
> -# The following information is for reference only and not required by the 
> build tools.
> -#
> -#  VALID_ARCHITECTURES   = ARM AARCH64
> -#
> -
> -[Sources]
> -  IntelBdsPlatform.c
> -  IntelBdsPlatformCommon.c
> -
> -[Packages]
> -  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
> -  MdeModulePkg/MdeModulePkg.dec
> -  MdePkg/MdePkg.dec
> -  Silicon/Hisilicon/HisiPkg.dec
> -
> -[LibraryClasses]
> -  BaseLib
> -  BaseMemoryLib
> -  DebugLib
> -  DevicePathLib
> -  GenericBdsLib
> -  IpmiCmdLib
> -  MemoryAllocationLib
> -  PcdLib
> -  PrintLib
> -  UefiBootServicesTableLib
> -  UefiRuntimeServicesTableLib
> -  UefiLib
> -
> -[FixedPcd]
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity
> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits
> -
> -[Pcd]
> -  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
> -
> -[Guids]
> -  gEfiEndOfDxeEventGroupGuid
> -  gEfiEventReadyToBootGuid
> -  gEfiFileInfoGuid
> -  gEfiFileSystemInfoGuid
> -  gEfiFileSystemVolumeLabelInfoIdGuid
> -
> -[Protocols]
> -  gEfiDevicePathProtocolGuid
> -  gEfiDevicePathToTextProtocolGuid
> -  gEfiGraphicsOutputProtocolGuid
> -  gEfiLoadedImageProtocolGuid
> -  gEfiPciRootBridgeIoProtocolGuid
> -  gEfiSimpleFileSystemProtocolGuid
> diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h 
> b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
> deleted file mode 100644
> index 4a912627a9..00
> --- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -/** @file
> -  Head file for BDS Platform specific code
> -
> -  Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.
> -  Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> -  Copyright (c) 2015, Linaro Limited. 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.
> -
> -  Based on the files

Re: [edk2-devel] [edk2-platforms][PATCH v1 11/16] Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> The below 3 Smbios drivers have dependency on IntelFramework[Module]Pkg:
> * MemorySubClassDxe
> * ProcessorSubClassDxe
> * SmbiosMiscDxe
>
> Their dependency is on the header file:
> IntelFrameworkPkg/Include/FrameworkDxe.h
>
> for definition 'STRING_REF'. This definition can be replaced by
> 'EFI_STRING_ID', which is defined within MdePkg.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf 
>  | 2 --
>  
> Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
> | 1 -
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf 
>  | 2 --
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h  
>  | 1 -
>  Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
>  | 4 +---
>  
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> | 4 ++--
>  
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> | 4 ++--
>  
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
>  | 4 ++--
>  
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
>| 2 +-
>  
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
>  | 4 ++--
>  10 files changed, 10 insertions(+), 18 deletions(-)
>
> diff --git 
> a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf 
> b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf
> index 94f6fe404c..a4e2a255f5 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf
> +++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf
> @@ -28,8 +28,6 @@
>  [Packages]
>MdePkg/MdePkg.dec
>MdeModulePkg/MdeModulePkg.dec
> -  IntelFrameworkPkg/IntelFrameworkPkg.dec
> -  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
>
>Silicon/Hisilicon/HisiliconNonOsi.dec
>Silicon/Hisilicon/HisiPkg.dec
> diff --git 
> a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
>  
> b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
> index 808da65cd4..9dfa3f879f 100644
> --- 
> a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
> +++ 
> b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
> @@ -30,7 +30,6 @@
>ArmPkg/ArmPkg.dec
>MdePkg/MdePkg.dec
>MdeModulePkg/MdeModulePkg.dec
> -  IntelFrameworkPkg/IntelFrameworkPkg.dec
>
>Silicon/Hisilicon/HisiliconNonOsi.dec
>Silicon/Hisilicon/HisiPkg.dec
> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf 
> b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
> index 0c37b53af9..e38d2ac1e9 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
> @@ -56,8 +56,6 @@
>ArmPkg/ArmPkg.dec
>MdePkg/MdePkg.dec
>MdeModulePkg/MdeModulePkg.dec
> -  IntelFrameworkPkg/IntelFrameworkPkg.dec
> -  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
>Silicon/Hisilicon/HisiliconNonOsi.dec
>Silicon/Hisilicon/HisiPkg.dec
>
> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h 
> b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h
> index 66f9db9665..3bf3cbdd1c 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h
> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h
> @@ -25,7 +25,6 @@ Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
>  #ifndef _SMBIOS_MISC_DRIVER_H
>  #define _SMBIOS_MISC_DRIVER_H
>
> -#include 
>  #include 
>  #include 
>  #include 
> diff --git 
> a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c 
> b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> index c9903ba535..f2f88e7d86 100644
> --- 
> a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> +++ 
> b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> @@ -15,8 +15,6 @@
>
>  #include "ProcessorSubClass.h"
>
> -#include 
> -
>  EFI_HII_HANDLE  mHiiHandle;
>
>  EFI_SMBIOS_PROTOCOL *mSmbios;
> @@ -487,7 +485,7 @@ AddSmbiosProcessorTypeTable (
>  PROCESSOR_CHARACTERISTICS_DATA  ProcessorCharacteristics = {{0}};
>
>  CHAR16  *CpuVersion;
> -STRING_REF  TokenToUpdate;
> +EFI_STRING_ID   TokenToUpdate;
>
>  UINT64  *ProcessorId;
>  Type4Record

Re: [edk2-devel] [edk2-platforms][PATCH v1 10/16] Silicon/Hisilicon: Use DebugLib (DXE_RUNTIME_DRIVER) in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC.INC file to consume the DXE_RUNTIME_DRIVER
> DebugLib instance in MdeModulePkg, instead of using the one in
> IntelFrameworkModulePkg.
>
> Please note that, the 2 DebugLib are almost identical. Thus, there is no
> functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Silicon/Hisilicon/Hisilicon.dsc.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc 
> b/Silicon/Hisilicon/Hisilicon.dsc.inc
> index ea12b8da0b..9138b19c3f 100644
> --- a/Silicon/Hisilicon/Hisilicon.dsc.inc
> +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
> @@ -205,7 +205,7 @@
>
> ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
>CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
>  !ifndef CONFIG_NO_DEBUGLIB
> -  
> DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
> +  
> DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
>  !endif
>  !if $(TARGET) != RELEASE
>
> DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40935): https://edk2.groups.io/g/devel/message/40935
Mute This Topic: https://groups.io/mt/31614331/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 08/16] Silicon/Hisilicon: Use Lzma decompress lib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC.INC file to consume the LzmaDecompressLib
> in MdeModulePkg, instead of using the one in IntelFrameworkModulePkg.
>
> Please note that, the 2 LzmaDecompressLib are identical. Thus, there is no
> functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 


> ---
>  Silicon/Hisilicon/Hisilicon.dsc.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc 
> b/Silicon/Hisilicon/Hisilicon.dsc.inc
> index 8a9812b9ed..72ba540a75 100644
> --- a/Silicon/Hisilicon/Hisilicon.dsc.inc
> +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
> @@ -99,7 +99,7 @@
>VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>
>
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> -  
> LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +  
> LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>
>
> NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
>
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40934): https://edk2.groups.io/g/devel/message/40934
Mute This Topic: https://groups.io/mt/31614329/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 07/16] Hisilicon/D06: Drop the consume of PcdShellFile

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> After the drop of the consume of GenericBdsLib, there is no module that
> will use gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile. This
> commit will drop the consume of this PCD.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Platform/Hisilicon/D06/D06.dsc | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
> index 0c12181a38..bcd57db6bb 100644
> --- a/Platform/Hisilicon/D06/D06.dsc
> +++ b/Platform/Hisilicon/D06/D06.dsc
> @@ -187,7 +187,6 @@
>
>
>gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
> -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 
> 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
>gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 
> 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
>gHisiTokenSpaceGuid.PcdSysControlBaseAddress|0x9401
>gHisiTokenSpaceGuid.PcdMailBoxAddress|0xFFF8
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40933): https://edk2.groups.io/g/devel/message/40933
Mute This Topic: https://groups.io/mt/31614328/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 06/16] Hisilicon/D0x: Use StatusCode Router & Handler in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Wed, 15 May 2019 at 21:47, Leif Lindholm  wrote:
>
> On Tue, May 14, 2019 at 10:08:21AM +0800, Hao A Wu wrote:
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> >
> > This commit adopts a similar approach to edk2 commit
> > a6d594c5fabd8da2273d2794826ec086cf9c3c04.
> >
> > Currently, Hisilicon platforms use modules from under
> > "IntelFrameworkModulePkg/Universal/StatusCode/", which produce
> > EFI_PEI_PROGRESS_CODE_PPI and EFI_STATUS_CODE_PROTOCOL directly, and write
> > the status codes, as they are reported, to the serial port or to a memory
> > buffer. This is called "handling" the status codes.
> >
> > MdeModulePkg offers a PEIM under
> > "MdeModulePkg/Universal/ReportStatusCodeRouter/Pei" that produces both
> > EFI_PEI_PROGRESS_CODE_PPI and EFI_PEI_RSC_HANDLER_PPI, and a runtime DXE
> > driver under "MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe"
> > that produces both EFI_STATUS_CODE_PROTOCOL and EFI_RSC_HANDLER_PROTOCOL.
> >
> > MdeModulePkg also offers status code handler modules under
> > MdeModulePkg/Universal/StatusCodeHandler/ that depend on
> > EFI_PEI_RSC_HANDLER_PPI and EFI_RSC_HANDLER_PROTOCOL, respectively.
> >
> > The StatusCodeHandler modules register themselves with
> > ReportStatusCodeRouter through EFI_PEI_RSC_HANDLER_PPI /
> > EFI_RSC_HANDLER_PROTOCOL. When another module reports a status code
> > through EFI_PEI_PROGRESS_CODE_PPI / EFI_STATUS_CODE_PROTOCOL, it reaches
> > the phase-matching ReportStatusCodeRouter module first, which in turn
> > passes the status code to the pre-registered, phase-matching
> > StatusCodeHandler module.
> >
> > The status code handling in the StatusCodeHandler modules is identical to
> > the one currently provided by the IntelFrameworkModulePkg modules. Replace
> > the IntelFrameworkModulePkg modules with the MdeModulePkg ones, so we can
> > decrease our dependency on IntelFrameworkModulePkg.
>
> I would like to have Ard's opinion on this (and he should be back
> Friday), and probably testing on the platforms. I say this because I
> intend to push the trivial patches today, but not this one.
>


I think this change is fine, but it should be tested on actual
hardware before it can be committed.

>
> > Cc: Ard Biesheuvel 
> > Cc: Leif Lindholm 
> > Cc: Michael D Kinney 
> > Signed-off-by: Hao A Wu 
> > ---
> >  Platform/Hisilicon/D03/D03.dsc | 6 --
> >  Platform/Hisilicon/D05/D05.dsc | 6 --
> >  Platform/Hisilicon/D06/D06.dsc | 6 --
> >  Platform/Hisilicon/D03/D03.fdf | 6 --
> >  Platform/Hisilicon/D05/D05.fdf | 6 --
> >  Platform/Hisilicon/D06/D06.fdf | 6 --
> >  6 files changed, 24 insertions(+), 12 deletions(-)
> >
> > diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
> > index 7e8cb59641..a3c3ae5aa6 100644
> > --- a/Platform/Hisilicon/D03/D03.dsc
> > +++ b/Platform/Hisilicon/D03/D03.dsc
> > @@ -303,7 +303,8 @@
> >
> >Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf
> >ArmPkg/Drivers/CpuPei/CpuPei.inf
> > -  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > +  
> > MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> > +  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> >MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
> >MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
> >
> > @@ -376,7 +377,8 @@
> >ArmPkg/Drivers/TimerDxe/TimerDxe.inf
> >
> >MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
> > -  
> > IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> > +  
> > MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> > +  
> > MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
> >#
> >#ACPI
> >#
> > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> > index 1d3a054d29..e285d1a3ce 100644
> > --- a/Platform/Hisilicon/D05/D05.dsc
> > +++ b/Platform/Hisilicon/D05/D05.dsc
> > @@ -439,7 +439,8 @@
> >
> >Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf
> >ArmPkg/Drivers/CpuPei/CpuPei.inf
> > -  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > +  
> > MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> > +  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> >MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
> >MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
> >
> > @@ -509,7 +510,8 @@
> >ArmPkg/Drivers/TimerDxe/TimerDxe.inf
> >
> >MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
> > -  
> > IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> > +  
> > MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> > +  
> >

Re: [edk2-devel] [edk2-platforms][PATCH v1 05/16] Hisilicon/D0x: Drop the consume of GenericBdsLib & PlatformBdsLib

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Wu, Hao A  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> Hisilicon platforms have already switched to the BDS driver in
> MdeModulePkg by commit 5845a5cde9d6bd51d77067b2594654005887a434.
>
> Thus, the consume of GenericBdsLib and PlatformBdsLib is no longer needed.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Platform/Hisilicon/D03/D03.dsc | 2 --
>  Platform/Hisilicon/D05/D05.dsc | 2 --
>  Platform/Hisilicon/D06/D06.dsc | 1 -
>  3 files changed, 5 deletions(-)
>
> diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
> index 066cace45b..7e8cb59641 100644
> --- a/Platform/Hisilicon/D03/D03.dsc
> +++ b/Platform/Hisilicon/D03/D03.dsc
> @@ -65,8 +65,6 @@
>
> OemAddressMapLib|Platform/Hisilicon/D03/Library/OemAddressMap2P/OemAddressMap2PHi1610.inf
>
> PlatformSysCtrlLib|Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlLibHi1610.inf
>
> -  
> GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
> -  
> PlatformBdsLib|Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
>
> BmcConfigBootLib|Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf
>
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> index d5b723ed40..1d3a054d29 100644
> --- a/Platform/Hisilicon/D05/D05.dsc
> +++ b/Platform/Hisilicon/D05/D05.dsc
> @@ -79,8 +79,6 @@
>
> OemAddressMapLib|Platform/Hisilicon/D05/Library/OemAddressMapD05/OemAddressMapD05.inf
>
> PlatformSysCtrlLib|Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlLibHi1616.inf
>
> -  
> GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
> -  
> PlatformBdsLib|Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
>
> BmcConfigBootLib|Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf
>
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
> index 73bea728b0..c1cd13b6c7 100644
> --- a/Platform/Hisilicon/D06/D06.dsc
> +++ b/Platform/Hisilicon/D06/D06.dsc
> @@ -70,7 +70,6 @@
>
> PlatformSysCtrlLib|Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlLibHi1620.inf
>
>CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> -  
> GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
>
> BmcConfigBootLib|Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf
>
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> --
> 2.12.0.windows.1
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40931): https://edk2.groups.io/g/devel/message/40931
Mute This Topic: https://groups.io/mt/31614326/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 04/16] Hisilicon/D0x: Use Lzma decompress lib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Wu, Hao A  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC file to consume the LzmaDecompressLib in
> MdeModulePkg, instead of using the one in IntelFrameworkModulePkg.
>
> Please note that, the 2 LzmaDecompressLib are identical. Thus, there is no
> functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Platform/Hisilicon/D03/D03.dsc | 2 +-
>  Platform/Hisilicon/D05/D05.dsc | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
> index 07ff461277..066cace45b 100644
> --- a/Platform/Hisilicon/D03/D03.dsc
> +++ b/Platform/Hisilicon/D03/D03.dsc
> @@ -316,7 +316,7 @@
>
>MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
>  
> -  
> NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +  
> NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>}
>
>#
> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> index 70b044c7e3..d5b723ed40 100644
> --- a/Platform/Hisilicon/D05/D05.dsc
> +++ b/Platform/Hisilicon/D05/D05.dsc
> @@ -452,7 +452,7 @@
>
>MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
>  
> -  
> NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +  
> NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>}
>
>#
> --
> 2.12.0.windows.1
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40930): https://edk2.groups.io/g/devel/message/40930
Mute This Topic: https://groups.io/mt/31614325/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH 2/2] Platform/BeagleBoard: Drop the consume of PcdShellFile

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 17:13, Leif Lindholm  wrote:
>
> On Tue, May 14, 2019 at 10:08:16AM +0800, Wu, Hao A wrote:
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> >
> > There is no module in the platform that will use
> > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile. This commit will
> > drop the consume of this PCD.
> >
> > Cc: Ard Biesheuvel 
> > Cc: Leif Lindholm 
> > Cc: Michael D Kinney 
> > Signed-off-by: Hao A Wu 
>
> Reviewed-by: Leif Lindholm 

Reviewed-by: Ard Biesheuvel 

>
> > ---
> >  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc 
> > b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> > index 8e8bb833ea..043204ce4f 100644
> > --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> > +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> > @@ -334,9 +334,6 @@
> >
> >gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
> >
> > -  # GUID of the UEFI Shell
> > -  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 
> > 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 
> > 0xB4, 0xD1 }
> > -
> ># GUID of the UI app
> >gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 
> > 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 
> > 0x23, 0x31 }
> >
> > --
> > 2.12.0.windows.1
> >
> >
> > 
> >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40929): https://edk2.groups.io/g/devel/message/40929
Mute This Topic: https://groups.io/mt/31614322/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 02/16] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Wu, Hao A  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC file to consume the ReportStatusCodeLib
> (DXE phase and Runtime instances) in MdeModulePkg, instead of using the
> one in IntelFrameworkModulePkg.
>
> Please note that, the DXE and Runtime ReportStatusCodeLib instances are
> almost identical between IntelFrameworkModulePkg and MdeModulePkg. Thus,
> there is no functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

This platform does not have a status code router, so should we not
simply switch to BaseReportStatusCodeLibNull.inf here?

> ---
>  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc 
> b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> index 2d5d6f9977..8e8bb833ea 100644
> --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> @@ -163,7 +163,7 @@
>HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
>
> MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
>DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
>  #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
> @@ -173,19 +173,19 @@
>
>
>  [LibraryClasses.common.DXE_DRIVER]
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
>
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>
> NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
>
>  [LibraryClasses.common.UEFI_APPLICATION]
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>
>  [LibraryClasses.common.UEFI_DRIVER]
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> @@ -193,7 +193,7 @@
>  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> -  
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
> +  
> ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
>CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
>  #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
>PeCoffLib|BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
> --
> 2.12.0.windows.1
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40928): https://edk2.groups.io/g/devel/message/40928
Mute This Topic: https://groups.io/mt/31614323/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH v1 01/16] Platform/AMD: Use Lzma decompress lib in MdeModulePkg

2019-05-17 Thread Ard Biesheuvel

On Tue, 14 May 2019 at 04:08, Hao A Wu  wrote:
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
>
> This commit will update the DSC file to consume the LzmaDecompressLib in
> MdeModulePkg, instead of using the one in IntelFrameworkModulePkg.
>
> Please note that, the 2 LzmaDecompressLib are identical. Thus, there is no
> functional impact for this commit.
>
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> Signed-off-by: Hao A Wu 

Reviewed-by: Ard Biesheuvel 

> ---
>  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc 
> b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> index 39b5dad154..c8faf5c4ab 100644
> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> @@ -521,7 +521,7 @@ DEFINE X64EMU_ENABLE  = FALSE
>MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
>MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
>  
> -  
> NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +  
> NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>}
>
>#
> --
> 2.12.0.windows.1
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40927): https://edk2.groups.io/g/devel/message/40927
Mute This Topic: https://groups.io/mt/31614320/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-announce] Design Meeting Recordings Available

2019-05-17 Thread Ni, Ray

Stephano,
Is there a way that can play the MP4 file without downloading them to hard 
drive?

Thanks,
Ray

> -Original Message-
> From: annou...@edk2.groups.io [mailto:annou...@edk2.groups.io] On
> Behalf Of Stephano Cetola
> Sent: Friday, May 17, 2019 11:07 PM
> To: annou...@edk2.groups.io
> Subject: [edk2-announce] Design Meeting Recordings Available
> 
> https://edk2.groups.io/g/devel/files/Designs/2019/0516
> 
> Both design meetings yesterday have been recorded and are available on
> Groups.io.
> 
> Cheers,
> Stephano
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40926): https://edk2.groups.io/g/devel/message/40926
Mute This Topic: https://groups.io/mt/31656179/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Ard Biesheuvel

On Fri, 17 May 2019 at 15:17, Laszlo Ersek  wrote:
>
> On 05/17/19 15:04, Laszlo Ersek wrote:
> > On 05/17/19 07:11, Wang, Jian J wrote:
> >> Hi Laszlo,
> >>
> >> There's already a float library used in OpensslLib.inf.
> >>
> >> [LibraryClasses.ARM]
> >>   ArmSoftFloatLib
> >>
> >> The problem is that the below instance doesn't implement __aeabi_ui2d
> >> and __aeabi_d2uiz (I encountered this one as well)
> >>
> >>   ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf
> >>
> >> I think we can update this library support those two APIs. So what about
> >> we still push the patch and file a BZ to fix this issue?
> >
> > I'm OK with that, but it will break ARM and AARCH64 platforms that
> > consume OpensslLib (directly or through BaseCryptLib), so this question
> > is up to Leif and Ard to decide.
>
> Correction: break ARM platforms only, not AARCH64.
>

We obviously need to fix this before we can upgrade to a new OpenSSL version.

Do we really have a need for the random functions? These seem the only
ones that use floating point, which the UEFI spec does not permit, so
it would be better if we could fix this by removing the dependency on
FP in the first place (and get rid of ArmSoftFloatLib entirely)

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40925): https://edk2.groups.io/g/devel/message/40925
Mute This Topic: https://groups.io/mt/31638503/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH] Maintainers.txt: remove UTF-8 BOM wrongly added in previous commit

2019-05-17 Thread Ni, Ray

Signed-off-by: Ray Ni 
Cc: Laszlo Ersek 
---
 Maintainers.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index 2d3a792c30..aaabe2b52d 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -1,4 +1,4 @@
-EDK II Maintainers
+EDK II Maintainers
 ==
 
 This file provides information about the primary maintainers for
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40924): https://edk2.groups.io/g/devel/message/40924
Mute This Topic: https://groups.io/mt/31656130/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] Maintainers.txt: Remove Nt32Pkg reference after Nt32Pkg is removed

2019-05-17 Thread Ni, Ray

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Friday, May 17, 2019 9:13 PM
> To: Ni, Ray ; devel@edk2.groups.io
> Cc: Gao, Liming ; Andrew Fish ;
> Leif Lindholm ; Kinney, Michael D
> 
> Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: Remove Nt32Pkg
> reference after Nt32Pkg is removed
> 
> On 05/17/19 06:57, Ray Ni wrote:
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Ray Ni 
> > Cc: Liming Gao 
> > Cc: Andrew Fish 
> > Cc: Laszlo Ersek 
> > Cc: Leif Lindholm 
> > Cc: Michael D Kinney 
> > ---
> >  Maintainers.txt | 7 +--
> >  1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/Maintainers.txt b/Maintainers.txt index
> > 7315241b6e..de0b6a284e 100644
> > --- a/Maintainers.txt
> > +++ b/Maintainers.txt
> > @@ -1,4 +1,4 @@
> > -EDK II Maintainers
> > +EDK II Maintainers
> 
> I'm commenting after the push, but:
> 
> why was the above line changed?
> 
> More precisely: *how* was it changed? (The diff doesn't indicate.)
> 
> ... A-ha! Looking at the pushed commit
> 147e6e70f2be2d3fdebcb2bd366324a24634d562, I can tell. You added a BOM
> to the beginning to the file.
> 
> Please send a new patch soon, to delete the BOM. (It's a bugfix so it is
> suitable for the soft feature freeze.)

I am a bit curious why I was that stupid to add a BOM in the beginning.
So I investigate further.
Root cause is below line contains a non-ASCII character that may cause
the editor I am using (not sure which one I used to edit the Maintainers.txt)
cleverly converts the file to UTF-8 with BOM.
R: Marc-André Lureau 

I will submit another patch to convert the file to UTF-8 without BOM.

> 
> Thanks
> Laszlo
> 
> >  ==
> >
> >  This file provides information about the primary maintainers for @@
> > -185,11 +185,6 @@ W:
> > https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
> >  M: Siyuan Fu 
> >  M: Jiaxin Wu 
> >
> > -Nt32Pkg
> > -W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
> > -M: Ray Ni 
> > -M: Hao A Wu 
> > -
> >  OvmfPkg
> >  W: http://www.tianocore.org/ovmf/
> >  M: Jordan Justen 
> >
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40923): https://edk2.groups.io/g/devel/message/40923
Mute This Topic: https://groups.io/mt/31651955/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platform][PATCH v3] MinPlatformPkg: Add multiple segment support for PciHostBridgeLib

2019-05-17 Thread Chaganty, Rangasai V

Reviewed-by: Rangasai V Chaganty  

-Original Message-
From: Chen, Marc W 
Sent: Friday, May 17, 2019 12:53 AM
To: devel@edk2.groups.io
Cc: Chen, Marc W ; Kubacki, Michael A 
; Chaganty, Rangasai V 

Subject: [edk2-platform][PATCH v3] MinPlatformPkg: Add multiple segment support 
for PciHostBridgeLib

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

1. Add PcdPciSegmentCount PCD in MinPlatformPkg.dec and set default to 1 2. 
Base on PciHostBridge related PCDs to Initialize RootBridges.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marc Chen 
Cc: Michael Kubacki 
Cc: Sai Chaganty 
---
 Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec   |  3 +-
 .../PciHostBridgeLibSimple.c   | 83 ++
 .../PciHostBridgeLibSimple.inf |  4 +-
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec 
b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
index 3185776ac3..e1ae8004cb 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
@@ -6,7 +6,7 @@
 # INF files to generate AutoGen.c and AutoGen.h files  # for the build 
infrastructure.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 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.
@@ -223,6 +223,7 @@ 
gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x9019
   gMinPlatformPkgTokenSpaceGuid.PcdPciDmaAbove4G   
|FALSE|BOOLEAN|0x4001004B
   gMinPlatformPkgTokenSpaceGuid.PcdPciNoExtendedConfigSpace
|FALSE|BOOLEAN|0x4001004C
   gMinPlatformPkgTokenSpaceGuid.PcdPciResourceAssigned 
|FALSE|BOOLEAN|0x4001004D
+  gMinPlatformPkgTokenSpaceGuid.PcdPciSegmentCount |0x1
|UINT8|0x4001004E
 
   
gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x1800|UINT16|0x00010035
   
gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x|UINT16|0x00010036
diff --git 
a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
 
b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
index 557ac2a5b3..25259e2f2d 100644
--- 
a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
+++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/P
+++ ciHostBridgeLibSimple.c
@@ -1,7 +1,7 @@
 /** @file
-  SA PciHostBridge Library
+  PciHostBridge Library
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 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 @@ -15,6 +15,7 @@ WITHOUT 
WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include 
 #include 
 #include 
+#include 
 #include 
 #include   #include  @@ -28,7 
+29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR 
IMPLIED.
 GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 
*mPciHostBridgeLibAcpiAddressSpaceTypeStr[] = {
   L"Mem", L"I/O", L"Bus"
 };
-ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
+ACPI_HID_DEVICE_PATH mRootBridgeDeviceNodeTemplate = {
   {
 ACPI_DEVICE_PATH,
 ACPI_DP,
@@ -41,7 +42,7 @@ ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
   0
 };
 
-PCI_ROOT_BRIDGE mRootBridge = {
+PCI_ROOT_BRIDGE mRootBridgeTemplate = {
   0,
   EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |
   EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO |
@@ -66,41 +67,67 @@ PCI_ROOT_BRIDGE mRootBridge = {
   NULL // DevicePath;
 };
 
+/**
+  Return all the root bridge instances.
+
+  @param Count  Return the count of root bridge instances.
+
+  @return All the root bridge instances, it will be NULL if system has 
insufficient memory
+  resources available and count will be zero.
+**/
+
 PCI_ROOT_BRIDGE *
 EFIAPI
 PciHostBridgeGetRootBridges (
   UINTN *Count
   )
 {
-  mRootBridge.Mem.Base = PcdGet32 (PcdPciReservedMemBase);
+  UINT8 Index;
+  PCI_ROOT_BRIDGE *RootBridge;
+
+  RootBridge = AllocateZeroPool (sizeof (PCI_ROOT_BRIDGE) * PcdGet8 
+ (PcdPciSegmentCount));  if (RootBridge == NULL) {
+DEBUG ((DEBUG_ERROR, "PciHostBridge: Out of resource\n"));
+*Count = 0;
+return RootBridge;
+  }
+
+  mRootBridgeTemplate.Mem.Base = PcdGet32 (PcdPciReservedMemBase);
   if (PcdGet32(PcdPciReservedMemLimit) != 0) {
-mRootBridge.Mem.Limit = PcdGet32 (PcdPciReservedMemLimit);
+mRootBridgeTemplate.Mem.Limit = PcdGet32 (PcdPciReservedMemLimit);
   } else {
-mRootBridge.Mem.Limit = (UINT32)PcdGet64 (PcdPciExpressBaseAddress);
+mRootBridgeTemplate.Mem.Limit

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent License

2019-05-17 Thread Chaganty, Rangasai V

Reviewed-by: Rangasai V Chaganty  

-Original Message-
From: Kinney, Michael D 
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Kubacki, Michael A ; Chaganty, Rangasai V 

Subject: [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: 
Replace BSD License with BSD+Patent License

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

Replace BSD 2-Clause License with BSD+Patent License.  This change is
based on the following emails:

  https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
  https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html

RFCs with detailed process for the license change:

  V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
  V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
  V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

Cc: Michael Kubacki 
Cc: Sai Chaganty 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney 
---
 Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl | 8 +---
 Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c   | 8 +---
 .../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf   | 8 +---
 .../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf   | 8 +---
 Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec  | 8 +---
 Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc  | 8 +---
 .../Include/Dsc/CoreAdvancedDxeInclude.dsc| 8 +---
 .../Include/Dsc/CoreAdvancedPeiInclude.dsc| 8 +---
 .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 8 +---
 .../Include/Fdf/CoreAdvancedPostMemoryInclude.fdf | 8 +---
 .../Include/Fdf/CoreAdvancedPreMemoryInclude.fdf  | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c  | 8 +---
 .../Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf | 8 +---
 .../AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl   | 8 +---
 .../Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi   | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c  | 8 +---
 .../Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c   | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c   | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf | 8 +---
 .../Ipmi/Include/Library/IpmiCommandLib.h | 8 +---
 .../Ipmi/Include/Library/IpmiPlatformHookLib.h| 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c  | 8 +---
 .../Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf | 8 +---
 .../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c  | 8 +---
 .../AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf  | 8 +---
 .../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c  | 8 +---
 .../AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf  | 8 +---
 .../Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf| 8 +---
 .../Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c  | 8 +---
 .../Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c   | 8 +---
 .../Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c   | 8 +---
 .../Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c | 8 +---
 .../Ipmi/Library/IpmiLibNull/IpmiLibNull.c| 8 +---
 .../Ipmi/Library/IpmiLibNull/IpmiLibNull.inf  | 8 +---
 .../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c | 8 +---
 .../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf   | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c  | 8 +---
 Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf| 8 +---
 .../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c   | 8 +---
 .../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf | 8 +---
 .../Smbios/SmbiosBasicDxe/SmbiosBasic.h   | 8 +---
 .../Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf  | 8 +---
 .../Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c | 8 +---
 .../Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c   | 8 +---
 .../SmbiosBasicDxe/Type1SystemManufacturerFunction.c  | 8 +---
 .../SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c   | 8 +---
 .../Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c | 8 +---
 .../SmbiosBasicDxe/Type3ChassisManufacturerFunction.c | 8 +---
 50 files changed, 50 insertions(+), 350 deletions(-)

diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl 
b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
index 7e05db17be..cbfe085b56 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
@@ -2,13 +2,7 @@
   Acpi Debug

Re: [edk2-devel] [PATCH v4 6/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Laszlo Ersek

On 05/17/19 13:14, Lu, XiaoyuX wrote:
> Laszlo,
> 
> I think (b) is better and have already done this.

What do you mean by "already done"? In your personal development tree
perhaps?

> About (b/1): 
> 
> One the one hand, the implementation still need discuss later. 
> On the other hand:
> 
> Refer to openssl/INSTALL the meaning of --with-rand-seed=none
>
>   > none:   Disable automatic seeding. This is the default
>   > on some operating systems where no suitable
>   > entropy source exists, or no support for it is
>   > implemented yet.
> 
> I think when --with-rand-seed=none option is set, the best way to implement 
> rand_pool_acquire_entropy should like this:
> 
>> size_t rand_pool_acquire_entropy(RAND_POOL *pool)
>> {
>>  return rand_pool_entropy_available(pool);
>> }
>>
>> int rand_pool_add_nonce_data(RAND_POOL *pool)
>> {  
>>  // I think PerformanceCounter is an optional nonce.
>>  UINT64 data;
>>  data = GetPerformanceCounter(); 
>>  
>>  return rand_pool_add(pool, (unsigned char*), sizeof(data), 0);>}
>>
>> int rand_pool_add_additional_data(RAND_POOL *pool)
>> {
>>  return 0;
>> }
> 
> With this, we handed the Rand_seed work to caller. (caller must provide safe 
> seed).
> 
> What do you think?

Sorry, no idea.

Thanks
Laszlo

> 
> Thanks,
> Xiaoyu
> 
> -Original Message-
> From: Laszlo Ersek [mailto:ler...@redhat.com] 
> Sent: Friday, May 17, 2019 12:32 AM
> To: devel@edk2.groups.io; Lu, XiaoyuX ; Wang, Jian J 
> 
> Cc: Ye, Ting 
> Subject: Re: [edk2-devel] [PATCH v4 6/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b
> 
> Hi Jian,
> 
> On 05/16/19 09:54, Xiaoyu lu wrote:
>> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1089
>>
>> * Update OpenSSL submodule to OpenSSL_1_1_1b
>>OpenSSL_1_1_1b(50eaac9f3337667259de725451f201e784599687)
>>
>> * Run process_files.pl script to regenerate OpensslLib[Crypto].inf
>>   and opensslconf.h
>>
>> * Remove -DNO_SYSLOG from OPENSSL_FLAGS in OpensslLib[Crypto].inf,
>>   due to upstream OpenSSL commit cff55b90e95e("Cleaning UEFI
>>   Build with additional OPENSSL_SYS_UEFI flags", 2017-03-29),
>>   which was first released as part of OpenSSL_1_1_1.
>>
>> * Starting with OpenSSL commit 8a8d9e1905(first release in
>>   OpenSSL_1_1_1), the OpenSSL_version() function can no longer
>>   return a pointer to the string literal "compiler: information
>>   not available", in the case CFLAGS macro is not defined.
>>   Instead, the function now has a hard dependency on the global
>>   variable 'compiler_flags'. This variable is normally placed
>>   by "util/mkbuildinf.pl" into "buildinf.h". In edk2 we don't
>>   run that script whenever we build OpenSSL, therefore we
>>   must provide our own dummy 'compiler_flags'.
>>
>> * From OpenSSL_1_1_0i(97c0959f27b294fe1eb10b547145ebef2524b896) to
>>   OpenSSL_1_1_1b(50eaac9f3337667259de725451f201e784599687), OpenSSL
>>   updated DRBG / RAND to request nonce and additional low entropy
>>   randomness from system(line 229 openssl/CHANGES).
>>
>>   Since OpenSSL_1_1_1b doesn't fully implement rand pool functions
>>   for UEFI. We must provide a method to implenet these method.
>>   TSC is used as first entropy source if it's availabe otherwise
>>   fallback to TimerLib. But we are not sure the amount of randomness
>>   they provide. If you really care about the security, one choice is
>>   overrided it with hardware generator.
>>
>>   Add rand_pool.c to implement these functions required by OpenSSL
>> rand_pool_acquire_entropy
>> rand_pool_add_nonce_data
>> rand_pool_add_additional_data
>> rand_pool_init
>> rand_pool_cleanup
>> rand_pool_keep_random_devices_open
>>
>>   And add rand_pool_noise.* for getting entropy noise from different
>>   architecture.
>>
>> * We don't need ossl_store functions. We exclude relative files
>>   through process_files.pl. And ossl_store_cleanup_int was first
>>   added in crypto/init.c OpenSSL_1_1_1(71a5516d).
>>   So add a new file(ossl_store.c) to implement ossl_store_cleanup_int
>>   function.
>>
>> * BUFSIZ is used by crypto/evp/evp_key.c(OpenSSL_1_1_1b)
>>   And it is declared in stdio.h. So add it to CrtLibSupport.h.
>>   Here's a discussion about this.
>>   Ref: https://github.com/openssl/openssl/issues/8904
>>
>> Cc: Jian J Wang 
>> Cc: Ting Ye 
>> Signed-off-by: Xiaoyu Lu 
>> ---
>>  CryptoPkg/Library/OpensslLib/OpensslLib.inf|  60 +++-
>>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf  |  51 +++-
>>  CryptoPkg/Library/Include/CrtLibSupport.h  |  13 +-
>>  CryptoPkg/Library/Include/openssl/opensslconf.h|  54 +++-
>>  CryptoPkg/Library/OpensslLib/buildinf.h|   2 +
>>  CryptoPkg/Library/OpensslLib/rand_pool_noise.h |  29 ++
>>  CryptoPkg/Library/OpensslLib/ossl_store.c  |  17 ++
>>  CryptoPkg/Library/OpensslLib/rand_pool.c   | 316 
>> +
>>

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Laszlo Ersek

On 05/17/19 15:04, Laszlo Ersek wrote:
> On 05/17/19 07:11, Wang, Jian J wrote:
>> Hi Laszlo,
>>
>> There's already a float library used in OpensslLib.inf. 
>>
>> [LibraryClasses.ARM]
>>   ArmSoftFloatLib
>>
>> The problem is that the below instance doesn't implement __aeabi_ui2d
>> and __aeabi_d2uiz (I encountered this one as well)
>>
>>   ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf
>>
>> I think we can update this library support those two APIs. So what about
>> we still push the patch and file a BZ to fix this issue?
> 
> I'm OK with that, but it will break ARM and AARCH64 platforms that
> consume OpensslLib (directly or through BaseCryptLib), so this question
> is up to Leif and Ard to decide.

Correction: break ARM platforms only, not AARCH64.

Laszlo

> Thanks
> Laszlo
> 
>>> -Original Message-
>>> From: Laszlo Ersek [mailto:ler...@redhat.com]
>>> Sent: Friday, May 17, 2019 2:26 AM
>>> To: devel@edk2.groups.io; Lu, XiaoyuX 
>>> Cc: Wang, Jian J ; Ye, Ting ; Ard
>>> Biesheuvel ; Leif Lindholm
>>> 
>>> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 
>>> 1.1.1b
>>>
>>> Hi,
>>>
>>> (+ Ard and Leif)
>>>
>>> On 05/16/19 09:54, Xiaoyu lu wrote:
 This series is also available at:

>>> https://github.com/xiaoyuxlu/edk2/tree/bz_1089_upgrade_to_openssl_1_1_1b
>>> _v4

 Changes:

 (1) CryptoPkgOpensslLib: Modify process_files.pl for  upgrading OpenSSL

 (2) CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
 crypto/store/* are excluded.
 crypto/rand/randfile.c is excluded.

 (3) CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue

 (4) CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
 Disable warnings for buiding OpenSSL_1_1_1b

 (5) CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64

 (6) CryptoPkg: Upgrade OpenSSL to 1.1.1b
 The biggest change is use TSC as entropy source
 If TSC isn't avaiable, fallback to TimerLib(PerformanceCounter).

 (7) CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible


 Verification done for this series:
 * Https boot in OvmfPkg.
 * BaseCrypt Library test. (Ovmf, EmulatorPkg)

 Important notice:
 Nt32Pkg doesn't support TimerLib
>
>>> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat
>>> e.inf
 So it will failed in Nt32Pkg.

 Cc: Jian J Wang 
 Cc: Ting Ye 

 Laszlo Ersek (1):
   CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64

 Xiaoyu Lu (6):
   CryptoPkg/OpensslLib: Modify process_files.pl for upgrading OpenSSL
   CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
   CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
   CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
   CryptoPkg: Upgrade OpenSSL to 1.1.1b
   CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible

  CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf|   4 +-
  CryptoPkg/Library/OpensslLib/OpensslLib.inf|  76 -
  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf  |  67 -
  CryptoPkg/Library/Include/CrtLibSupport.h  |  13 +-
  CryptoPkg/Library/Include/openssl/opensslconf.h|  54 +++-
  CryptoPkg/Library/Include/sys/syscall.h|  11 +
  CryptoPkg/Library/OpensslLib/buildinf.h|   2 +
  CryptoPkg/Library/OpensslLib/rand_pool_noise.h |  29 ++
  CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c |   8 +-
  .../Library/BaseCryptLib/Hmac/CryptHmacSha1.c  |   9 +-
  .../Library/BaseCryptLib/Hmac/CryptHmacSha256.c|   8 +-
  CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c |  22 ++
  CryptoPkg/Library/OpensslLib/ossl_store.c  |  17 ++
  CryptoPkg/Library/OpensslLib/rand_pool.c   | 316
>>> +
  CryptoPkg/Library/OpensslLib/rand_pool_noise.c |  29 ++
  CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c |  43 +++
  CryptoPkg/Library/OpensslLib/openssl   |   2 +-
  CryptoPkg/Library/OpensslLib/process_files.pl  |  11 +-
  18 files changed, 669 insertions(+), 52 deletions(-)
  create mode 100644 CryptoPkg/Library/Include/sys/syscall.h
  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.h
  create mode 100644 CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
  create mode 100644 CryptoPkg/Library/OpensslLib/ossl_store.c
  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool.c
  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.c
  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c

>>>
>>> Unfortunately, I've found another build issue with this series. (My
>>> apologies that I didn't discover it earlier.) It is reported in the
>>> 32-bit (ARM) build of the ArmVirtQemu platform:
>>>

Re: [edk2-devel] [PATCH] Maintainers.txt: Remove Nt32Pkg reference after Nt32Pkg is removed

2019-05-17 Thread Laszlo Ersek

On 05/17/19 06:57, Ray Ni wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ray Ni 
> Cc: Liming Gao 
> Cc: Andrew Fish 
> Cc: Laszlo Ersek 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 
> ---
>  Maintainers.txt | 7 +--
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index 7315241b6e..de0b6a284e 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -1,4 +1,4 @@
> -EDK II Maintainers
> +EDK II Maintainers

I'm commenting after the push, but:

why was the above line changed?

More precisely: *how* was it changed? (The diff doesn't indicate.)

... A-ha! Looking at the pushed commit
147e6e70f2be2d3fdebcb2bd366324a24634d562, I can tell. You added a BOM to
the beginning to the file.

Please send a new patch soon, to delete the BOM. (It's a bugfix so it is
suitable for the soft feature freeze.)

Thanks
Laszlo

>  ==
>
>  This file provides information about the primary maintainers for
> @@ -185,11 +185,6 @@ W: 
> https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
>  M: Siyuan Fu 
>  M: Jiaxin Wu 
>
> -Nt32Pkg
> -W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
> -M: Ray Ni 
> -M: Hao A Wu 
> -
>  OvmfPkg
>  W: http://www.tianocore.org/ovmf/
>  M: Jordan Justen 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40918): https://edk2.groups.io/g/devel/message/40918
Mute This Topic: https://groups.io/mt/31651955/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib: Remove CPU generation check

2019-05-17 Thread Ni, Ray

Star,
I understand the motivation of the change.

Given your statement that all processors you met follows the rule,
and I know that you are currently working very actively on Intel processors,
Reviewed-by: Ray Ni 

> -Original Message-
> From: Zeng, Star
> Sent: Friday, May 17, 2019 11:05 AM
> To: Ni, Ray ; devel@edk2.groups.io; ler...@redhat.com
> Cc: Dong, Eric ; Kumar, Chandana C
> ; Li, Kevin Y ; Zeng,
> Star 
> Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> Remove CPU generation check
> 
> Situation: All the generations (including the internal generations not listed 
> in
> SDM) we saw have MSR 13Ch available when CpuInfo-
> >CpuIdVersionInfoEcx.Bits.AESNI == 1.
> 
> Requirement: Reuse more code.
> 
> Could you help think the good method and even propose the patch for that?
> I am ok to any method to improve the code's reusability.
> Otherwise, we can only use function level override method ina
> CpuSpecificFeaturesLib.
> Status = RegisterCpuFeature (
>"AESNI",
>NULL, // Use core 
> function
>SpecificAesniSupport, // Override core 
> function
>NULL, // Use core 
> function
>CPU_FEATURE_AESNI,
>CPU_FEATURE_END
>);
> 
> Thanks,
> Star
> > -Original Message-
> > From: Ni, Ray
> > Sent: Friday, May 17, 2019 9:04 AM
> > To: Zeng, Star ; devel@edk2.groups.io;
> > ler...@redhat.com
> > Cc: Dong, Eric ; Kumar, Chandana C
> > 
> > Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> > Remove CPU generation check
> >
> > Star,
> > I think the discussion is about providing the evidence to support
> > removing the generation check.
> > Not just the benefit of that.
> >
> > Thanks,
> > Ray
> >
> > > -Original Message-
> > > From: Zeng, Star
> > > Sent: Thursday, May 16, 2019 10:52 PM
> > > To: devel@edk2.groups.io; ler...@redhat.com
> > > Cc: Dong, Eric ; Ni, Ray ;
> > > Kumar, Chandana C ; Zeng, Star
> > > 
> > > Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> > > Remove CPU generation check
> > >
> > > Laszlo,
> > >
> > > > -Original Message-
> > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf
> > > > Of Laszlo Ersek
> > > > Sent: Thursday, May 16, 2019 9:06 PM
> > > > To: Zeng, Star ; devel@edk2.groups.io
> > > > Cc: Dong, Eric ; Ni, Ray ;
> > > > Kumar, Chandana C 
> > > > Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
> > > > Remove CPU generation check
> > > >
> > > > Hi Star,
> > > >
> > > > On 05/16/19 12:33, Star Zeng wrote:
> > > > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1679
> > > > >
> > > > > The checking to CpuInfo->CpuIdVersionInfoEcx.Bits.AESNI is
> > > > > enough, the checking to CPU generation could be removed, then
> > > > > the code could be reused by more platforms.
> > > > >
> > > > > Cc: Laszlo Ersek 
> > > > > Cc: Eric Dong 
> > > > > Cc: Ruiyu Ni 
> > > > > Cc: Chandana Kumar 
> > > > > Signed-off-by: Star Zeng 
> > > > > ---
> > > > >  UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c | 12
> > > > > +++-
> > > > >  1 file changed, 3 insertions(+), 9 deletions(-)
> > > > >
> > > > > diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > index b79446ba3ca9..4a56eec1b267 100644
> > > > > --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> > > > > @@ -57,15 +57,9 @@ AesniSupport (
> > > > >MSR_SANDY_BRIDGE_FEATURE_CONFIG_REGISTER
> > > *MsrFeatureConfig;
> > > > >
> > > > >if (CpuInfo->CpuIdVersionInfoEcx.Bits.AESNI == 1) {
> > > > > -if (IS_SANDY_BRIDGE_PROCESSOR (CpuInfo->DisplayFamily,
> > CpuInfo-
> > > > >DisplayModel) ||
> > > > > -IS_SILVERMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> > > > >DisplayModel) ||
> > > > > -IS_XEON_5600_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> > > > >DisplayModel) ||
> > > > > -IS_XEON_E7_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> > > > >DisplayModel) ||
> > > > > -IS_XEON_PHI_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> > > > >DisplayModel)) {
> > > > > -  MsrFeatureConfig =
> > > > (MSR_SANDY_BRIDGE_FEATURE_CONFIG_REGISTER *) ConfigData;
> > > > > -  ASSERT (MsrFeatureConfig != NULL);
> > > > > -  MsrFeatureConfig[ProcessorNumber].Uint64 = AsmReadMsr64
> > > > (MSR_SANDY_BRIDGE_FEATURE_CONFIG);
> > > > > -}
> > > > > +MsrFeatureConfig =
> > > > (MSR_SANDY_BRIDGE_FEATURE_CONFIG_REGISTER *) ConfigData;
> > > > > +ASSERT (MsrFeatureConfig != NULL);
> > > > > +MsrFeatureConfig[ProcessorNumber].Uint64 = AsmReadMsr64
> > > > > + (MSR_SANDY_BRIDGE_FEATURE_CONFIG);
> > > > >  return TRUE;
> > > > >}
> > > > >return FALSE;
> > > > >
> > > >
> > > > the patch

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Laszlo Ersek

On 05/17/19 12:12, Lu, XiaoyuX wrote:
> Hi, Lerszlo:

well... I agree that my first name may not be trivial to spell, but you
can always use the clipboard, whenever in doubt.

For the record, it's "Laszlo".

> 
> (1):
> 
>> Unfortunately, I've found another build issue with this series. (My 
>> apologies that I didn't discover it earlier.) It is reported in the 32-bit 
>> (ARM) build of the ArmVirtQemu platform:
>>
>>   CryptoPkg/Library/OpensslLib/openssl/crypto/rand/drbg_lib.c:1028:
>>   undefined reference to `__aeabi_ui2d'
>>
> 
> OpensslLib[Crypto].inf contains ArmSoftFloatLib as dependent library.
> 
> In ArmSoftFloatLib:
> 
>  softfloat-for-gcc.h|98| #define uint32_to_float64   __floatunsidf
>  softfloat-for-gcc.h|222| #define __floatunsidf   __aeabi_ui2d
> 
>  softfloat-for-gcc.h|128| #define float64_to_uint32_round_to_zero 
> __fixunsdfsi
>  softfloat-for-gcc.h|234| #define __fixunsdfsi__aeabi_d2uiz
> 
> But *uint32_to_float64* and *float64_to_uint32_round_to_zero* aren't 
> implemented in softfloat.c
> 
> If these two functions implement, the build will pass. (I use dummy functions 
> and try)

See my response to Jian on this.

> (2):
> 
>> thus, preferably, a CryptoPkg patch series should be at least build tested 
>> (if not boot tested) for all arches, before being posted to the mailing list.
> 
> I should test ARM, since IA32 arch has Intrinsic problem(_ftol2). It is very 
> likely that ARM arch does not support it either. 
> 
>> (Yes, CI would help a lot with such issues.)
> 
> Now I don't have a CI environment here. 
> I will setup one for building OvmfPkg, ArmVirtPkg, EmulatorPkg.

Sorry, I was unclear: I meant a community-level, central CI. Not a
personal one. And, the central CI is undergoing design discussions right
now.

Thanks
Laszlo



> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Laszlo 
> Ersek
> Sent: Friday, May 17, 2019 2:26 AM
> To: devel@edk2.groups.io; Lu, XiaoyuX 
> Cc: Wang, Jian J ; Ye, Ting ; Ard 
> Biesheuvel ; Leif Lindholm 
> 
> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b
> 
> Hi,
> 
> (+ Ard and Leif)
> 
> On 05/16/19 09:54, Xiaoyu lu wrote:
>> This series is also available at:
>> https://github.com/xiaoyuxlu/edk2/tree/bz_1089_upgrade_to_openssl_1_1_
>> 1b_v4
>>
>> Changes:
>>
>> (1) CryptoPkgOpensslLib: Modify process_files.pl for  upgrading 
>> OpenSSL
>>
>> (2) CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
>> crypto/store/* are excluded.
>> crypto/rand/randfile.c is excluded.
>>
>> (3) CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol 
>> issue
>>
>> (4) CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
>> Disable warnings for buiding OpenSSL_1_1_1b
>>
>> (5) CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
>>
>> (6) CryptoPkg: Upgrade OpenSSL to 1.1.1b
>> The biggest change is use TSC as entropy source
>> If TSC isn't avaiable, fallback to TimerLib(PerformanceCounter).
>>
>> (7) CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
>>
>>
>> Verification done for this series:
>> * Https boot in OvmfPkg.
>> * BaseCrypt Library test. (Ovmf, EmulatorPkg)
>>
>> Important notice:
>> Nt32Pkg doesn't support TimerLib
>>> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemp
>>> TimerLib|late.inf
>> So it will failed in Nt32Pkg.
>>
>> Cc: Jian J Wang 
>> Cc: Ting Ye 
>>
>> Laszlo Ersek (1):
>>   CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
>>
>> Xiaoyu Lu (6):
>>   CryptoPkg/OpensslLib: Modify process_files.pl for upgrading OpenSSL
>>   CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
>>   CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
>>   CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
>>   CryptoPkg: Upgrade OpenSSL to 1.1.1b
>>   CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
>>
>>  CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf|   4 +-
>>  CryptoPkg/Library/OpensslLib/OpensslLib.inf|  76 -
>>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf  |  67 -
>>  CryptoPkg/Library/Include/CrtLibSupport.h  |  13 +-
>>  CryptoPkg/Library/Include/openssl/opensslconf.h|  54 +++-
>>  CryptoPkg/Library/Include/sys/syscall.h|  11 +
>>  CryptoPkg/Library/OpensslLib/buildinf.h|   2 +
>>  CryptoPkg/Library/OpensslLib/rand_pool_noise.h |  29 ++
>>  CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c |   8 +-
>>  .../Library/BaseCryptLib/Hmac/CryptHmacSha1.c  |   9 +-
>>  .../Library/BaseCryptLib/Hmac/CryptHmacSha256.c|   8 +-
>>  CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c |  22 ++
>>  CryptoPkg/Library/OpensslLib/ossl_store.c  |  17 ++
>>  CryptoPkg/Library/OpensslLib/rand_pool.c   | 316 
>> +
>>  CryptoPkg/Library/OpensslLib/rand_pool_noise.c |  29 ++
>>

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Laszlo Ersek

On 05/17/19 07:11, Wang, Jian J wrote:
> Hi Laszlo,
> 
> There's already a float library used in OpensslLib.inf. 
> 
> [LibraryClasses.ARM]
>   ArmSoftFloatLib
> 
> The problem is that the below instance doesn't implement __aeabi_ui2d
> and __aeabi_d2uiz (I encountered this one as well)
> 
>   ArmPkg\Library\ArmSoftFloatLib\ArmSoftFloatLib.inf
> 
> I think we can update this library support those two APIs. So what about
> we still push the patch and file a BZ to fix this issue?

I'm OK with that, but it will break ARM and AARCH64 platforms that
consume OpensslLib (directly or through BaseCryptLib), so this question
is up to Leif and Ard to decide.

Thanks
Laszlo

>> -Original Message-
>> From: Laszlo Ersek [mailto:ler...@redhat.com]
>> Sent: Friday, May 17, 2019 2:26 AM
>> To: devel@edk2.groups.io; Lu, XiaoyuX 
>> Cc: Wang, Jian J ; Ye, Ting ; Ard
>> Biesheuvel ; Leif Lindholm
>> 
>> Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b
>>
>> Hi,
>>
>> (+ Ard and Leif)
>>
>> On 05/16/19 09:54, Xiaoyu lu wrote:
>>> This series is also available at:
>>>
>> https://github.com/xiaoyuxlu/edk2/tree/bz_1089_upgrade_to_openssl_1_1_1b
>> _v4
>>>
>>> Changes:
>>>
>>> (1) CryptoPkgOpensslLib: Modify process_files.pl for  upgrading OpenSSL
>>>
>>> (2) CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
>>> crypto/store/* are excluded.
>>> crypto/rand/randfile.c is excluded.
>>>
>>> (3) CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
>>>
>>> (4) CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
>>> Disable warnings for buiding OpenSSL_1_1_1b
>>>
>>> (5) CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
>>>
>>> (6) CryptoPkg: Upgrade OpenSSL to 1.1.1b
>>> The biggest change is use TSC as entropy source
>>> If TSC isn't avaiable, fallback to TimerLib(PerformanceCounter).
>>>
>>> (7) CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
>>>
>>>
>>> Verification done for this series:
>>> * Https boot in OvmfPkg.
>>> * BaseCrypt Library test. (Ovmf, EmulatorPkg)
>>>
>>> Important notice:
>>> Nt32Pkg doesn't support TimerLib

>> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat
>> e.inf
>>> So it will failed in Nt32Pkg.
>>>
>>> Cc: Jian J Wang 
>>> Cc: Ting Ye 
>>>
>>> Laszlo Ersek (1):
>>>   CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
>>>
>>> Xiaoyu Lu (6):
>>>   CryptoPkg/OpensslLib: Modify process_files.pl for upgrading OpenSSL
>>>   CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
>>>   CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
>>>   CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
>>>   CryptoPkg: Upgrade OpenSSL to 1.1.1b
>>>   CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
>>>
>>>  CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf|   4 +-
>>>  CryptoPkg/Library/OpensslLib/OpensslLib.inf|  76 -
>>>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf  |  67 -
>>>  CryptoPkg/Library/Include/CrtLibSupport.h  |  13 +-
>>>  CryptoPkg/Library/Include/openssl/opensslconf.h|  54 +++-
>>>  CryptoPkg/Library/Include/sys/syscall.h|  11 +
>>>  CryptoPkg/Library/OpensslLib/buildinf.h|   2 +
>>>  CryptoPkg/Library/OpensslLib/rand_pool_noise.h |  29 ++
>>>  CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c |   8 +-
>>>  .../Library/BaseCryptLib/Hmac/CryptHmacSha1.c  |   9 +-
>>>  .../Library/BaseCryptLib/Hmac/CryptHmacSha256.c|   8 +-
>>>  CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c |  22 ++
>>>  CryptoPkg/Library/OpensslLib/ossl_store.c  |  17 ++
>>>  CryptoPkg/Library/OpensslLib/rand_pool.c   | 316
>> +
>>>  CryptoPkg/Library/OpensslLib/rand_pool_noise.c |  29 ++
>>>  CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c |  43 +++
>>>  CryptoPkg/Library/OpensslLib/openssl   |   2 +-
>>>  CryptoPkg/Library/OpensslLib/process_files.pl  |  11 +-
>>>  18 files changed, 669 insertions(+), 52 deletions(-)
>>>  create mode 100644 CryptoPkg/Library/Include/sys/syscall.h
>>>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.h
>>>  create mode 100644 CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
>>>  create mode 100644 CryptoPkg/Library/OpensslLib/ossl_store.c
>>>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool.c
>>>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.c
>>>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c
>>>
>>
>> Unfortunately, I've found another build issue with this series. (My
>> apologies that I didn't discover it earlier.) It is reported in the
>> 32-bit (ARM) build of the ArmVirtQemu platform:
>>
>>   CryptoPkg/Library/OpensslLib/openssl/crypto/rand/drbg_lib.c:1028:
>>   undefined reference to `__aeabi_ui2d'
>>
>> The referenced line is from the drbg_add() function:
>>
>> if (buflen < seedlen || randomness <

Re: [edk2-devel] [PATCH] BaseTools:Update mailing list address in BaseTools error messages

2019-05-17 Thread Laszlo Ersek

Hi Zhiju,

On 05/17/19 05:07, Fan, ZhijuX wrote:
> (2)ExtraData=ST.MSG_SEARCH_FOR_HELP % EDKII_MAIL_ADDR
> 
> I have tried to solve this problem in this way. ST is the collection of all 
> ExtraData information in UPT,
> This collection does not exist in other modules, Other modules have only the 
> collection of error message.
> All ExtraData information exists as a string, There is no uniform variable 
> like ST to collect this information.
> So I created EDKII_MAIL_ADDR to achieve the same effect.

You misunderstood me.

(a) The definition of EDKII_MAIL_ADDR is fine.

(b) The way you consume EDKII_MAIL_ADDR in "GenFds.py", "Trim.py", and 
"build.py", is also fine.

(c) The way you hardwire the email address "devel@edk2.groups.io" in 
"StringTable.py" is not fine.

Rather than directly embedding the email address in MSG_SEARCH_FOR_HELP, you 
should change MSG_SEARCH_FOR_HELP to take a string parameter (%s).

Then all locations in UPT that refer to MSG_SEARCH_FOR_HELP should be updated 
to substitute EDKII_MAIL_ADDR for the %s parameter of MSG_SEARCH_FOR_HELP.

Let me demonstrate:

-
diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py 
b/BaseTools/Source/Python/UPT/InstallPkg.py
index 6cb9f2533df5..0249810b3a9e 100644
--- a/BaseTools/Source/Python/UPT/InstallPkg.py
+++ b/BaseTools/Source/Python/UPT/InstallPkg.py
@@ -547,7 +547,7 @@ def Main(Options = None):
 "\nInstallPkg",
 CODE_ERROR,
 ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.PackageFile,
-ExtraData=ST.MSG_SEARCH_FOR_HELP,
+ExtraData=(ST.MSG_SEARCH_FOR_HELP % EDKII_MAIL_ADDR),
 RaiseError=False
 )
 Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(),
diff --git a/BaseTools/Source/Python/UPT/Logger/StringTable.py 
b/BaseTools/Source/Python/UPT/Logger/StringTable.py
index 59f71d390bef..48321ee0b865 100644
--- a/BaseTools/Source/Python/UPT/Logger/StringTable.py
+++ b/BaseTools/Source/Python/UPT/Logger/StringTable.py
@@ -317,7 +317,7 @@ MSG_NEW_FILE_NAME_FOR_DIST  = _(
 MSG_UPDATE_PACKAGE_DATABASE= _("Update Distribution Package Database ...")
 MSG_PYTHON_ON  = _("(Python %s on %s) ")
 MSG_SEARCH_FOR_HELP= _(
-"\n(Please send email to edk2-de...@lists.01.org for\n"
+"\n(Please send email to %s for\n"
 " help, attach the following call stack trace.)\n")
 MSG_REMOVE_TEMP_FILE_STARTED   = _("Removing temp files started ... ")
 MSG_REMOVE_TEMP_FILE_DONE   = _("Removing temp files ... Done.")
-

Thanks
Laszlo


>> -Original Message-
>> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>> Laszlo Ersek
>> Sent: Thursday, May 16, 2019 9:17 PM
>> To: devel@edk2.groups.io; Fan, ZhijuX 
>> Cc: Gao, Liming ; Feng, Bob C 
>> Subject: Re: [edk2-devel] [PATCH] BaseTools:Update mailing list address in
>> BaseTools error messages
>>
>> On 05/16/19 07:11, Fan, ZhijuX wrote:
>>> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1815
>>>
>>> The edk2 source tree contains four instances of the outdated mailing
>>> list address "edk2-de...@lists.01.org".
>>> I factoring these out to a new constant, and then setting the constant
>>> to "devel@edk2.groups.io".
>>
>> (1) The commit message should be cleaned up: "Factor these out ... and then
>> set ..."
>>
>> Furthermore:
>>
>>>
>>> Cc: Bob Feng 
>>> Cc: Liming Gao 
>>> Signed-off-by: Zhiju.Fan 
>>> ---
>>>  BaseTools/Source/Python/Common/DataType.py| 1 +
>>>  BaseTools/Source/Python/GenFds/GenFds.py  | 2 +-
>>>  BaseTools/Source/Python/Trim/Trim.py  | 2 +-
>>>  BaseTools/Source/Python/UPT/Logger/StringTable.py | 2 +-
>>>  BaseTools/Source/Python/build/build.py| 2 +-
>>>  5 files changed, 5 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/BaseTools/Source/Python/Common/DataType.py
>>> b/BaseTools/Source/Python/Common/DataType.py
>>> index 780711bf8e..7f10533345 100644
>>> --- a/BaseTools/Source/Python/Common/DataType.py
>>> +++ b/BaseTools/Source/Python/Common/DataType.py
>>> @@ -88,6 +88,7 @@ EDK_COMPONENT_TYPE_SAL_RT_DRIVER =
>> 'SAL_RT_DRIVER'
>>>  EDK_COMPONENT_TYPE_APPLICATION = 'APPLICATION'
>>>  EDK_NAME = 'EDK'
>>>  EDKII_NAME = 'EDKII'
>>> +EDKII_MAIL_ADDR = 'devel@edk2.groups.io'
>>>
>>>  COMPONENT_TO_MODULE_MAP_DICT = {
>>>  EDK_COMPONENT_TYPE_LIBRARY   :   SUP_MODULE_BASE,
>>> diff --git a/BaseTools/Source/Python/GenFds/GenFds.py
>>> b/BaseTools/Source/Python/GenFds/GenFds.py
>>> index 21ae9c4d4c..bd70aac9f5 100644
>>> --- a/BaseTools/Source/Python/GenFds/GenFds.py
>>> +++ b/BaseTools/Source/Python/GenFds/GenFds.py
>>> @@ -388,7 +388,7 @@ def GenFdsApi(FdsCommandDict,
>> WorkSpaceDataBase=None):
>>>  "\nPython",
>>>  CODE_ERROR,
>>>  "Tools code failure",
>>> -ExtraData="Please send email to 
>>> edk2-de...@lists.01.org

Re: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib: Remove CPU generation check

2019-05-17 Thread Laszlo Ersek

Hi Star,

On 05/17/19 05:05, Zeng, Star wrote:
> Situation: All the generations (including the internal generations not listed 
> in SDM) we saw have MSR 13Ch available when 
> CpuInfo->CpuIdVersionInfoEcx.Bits.AESNI == 1.

This is a very accurate description, thank you; and it's exactly what I
feel is insufficient. "All generations we've seen" is not equal to "all
generations that (a) have ever existed plus (b) will ever exist".

Anyway, I now understand the motivation behind the patch, thanks. Given
that OVMF cannot be regressed by it, I don't intend to block it -- I
defer to other UefiCpuPkg reviewers. If they are OK with the patch, so am I.

Thanks!
Laszlo

> 
> Requirement: Reuse more code.
> 
> Could you help think the good method and even propose the patch for that? I 
> am ok to any method to improve the code's reusability.
> Otherwise, we can only use function level override method ina 
> CpuSpecificFeaturesLib.
> Status = RegisterCpuFeature (
>"AESNI",
>NULL, // Use core 
> function
>SpecificAesniSupport, // Override core 
> function
>NULL, // Use core 
> function
>CPU_FEATURE_AESNI,
>CPU_FEATURE_END
>);
> 
> Thanks,
> Star
>> -Original Message-
>> From: Ni, Ray
>> Sent: Friday, May 17, 2019 9:04 AM
>> To: Zeng, Star ; devel@edk2.groups.io;
>> ler...@redhat.com
>> Cc: Dong, Eric ; Kumar, Chandana C
>> 
>> Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
>> Remove CPU generation check
>>
>> Star,
>> I think the discussion is about providing the evidence to support removing
>> the generation check.
>> Not just the benefit of that.
>>
>> Thanks,
>> Ray
>>
>>> -Original Message-
>>> From: Zeng, Star
>>> Sent: Thursday, May 16, 2019 10:52 PM
>>> To: devel@edk2.groups.io; ler...@redhat.com
>>> Cc: Dong, Eric ; Ni, Ray ;
>>> Kumar, Chandana C ; Zeng, Star
>>> 
>>> Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
>>> Remove CPU generation check
>>>
>>> Laszlo,
>>>
 -Original Message-
 From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf
 Of Laszlo Ersek
 Sent: Thursday, May 16, 2019 9:06 PM
 To: Zeng, Star ; devel@edk2.groups.io
 Cc: Dong, Eric ; Ni, Ray ;
 Kumar, Chandana C 
 Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg CpuCommonFeaturesLib:
 Remove CPU generation check

 Hi Star,

 On 05/16/19 12:33, Star Zeng wrote:
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1679
>
> The checking to CpuInfo->CpuIdVersionInfoEcx.Bits.AESNI is enough,
> the checking to CPU generation could be removed, then the code
> could be reused by more platforms.
>
> Cc: Laszlo Ersek 
> Cc: Eric Dong 
> Cc: Ruiyu Ni 
> Cc: Chandana Kumar 
> Signed-off-by: Star Zeng 
> ---
>  UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c | 12 +++-
>  1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> index b79446ba3ca9..4a56eec1b267 100644
> --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/Aesni.c
> @@ -57,15 +57,9 @@ AesniSupport (
>MSR_SANDY_BRIDGE_FEATURE_CONFIG_REGISTER
>>> *MsrFeatureConfig;
>
>if (CpuInfo->CpuIdVersionInfoEcx.Bits.AESNI == 1) {
> -if (IS_SANDY_BRIDGE_PROCESSOR (CpuInfo->DisplayFamily,
>> CpuInfo-
> DisplayModel) ||
> -IS_SILVERMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> DisplayModel) ||
> -IS_XEON_5600_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> DisplayModel) ||
> -IS_XEON_E7_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> DisplayModel) ||
> -IS_XEON_PHI_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> DisplayModel)) {
> -  MsrFeatureConfig =
 (MSR_SANDY_BRIDGE_FEATURE_CONFIG_REGISTER *) ConfigData;
> -  ASSERT (MsrFeatureConfig != NULL);
> -  MsrFeatureConfig[ProcessorNumber].Uint64 = AsmReadMsr64
 (MSR_SANDY_BRIDGE_FEATURE_CONFIG);
> -}
> +MsrFeatureConfig =
 (MSR_SANDY_BRIDGE_FEATURE_CONFIG_REGISTER *) ConfigData;
> +ASSERT (MsrFeatureConfig != NULL);
> +MsrFeatureConfig[ProcessorNumber].Uint64 = AsmReadMsr64
> + (MSR_SANDY_BRIDGE_FEATURE_CONFIG);
>  return TRUE;
>}
>return FALSE;
>

 the patch and the bugzilla ticket claim that the AESNI bit's
 presence in CPUID guarantees that MSR 0x13C is available.
>>>
>>> That is the case we met. The purpose of this patch is to make the code
>>> more usable.
>>>

 I don't see what guarantees this. According to the latest Intel SDM
 Vol 4, which I just

Re: [edk2-devel] [PATCH v4 6/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Xiaoyu Lu

Laszlo,

I think (b) is better and have already done this.

About (b/1): 

One the one hand, the implementation still need discuss later. 
On the other hand:

Refer to openssl/INSTALL the meaning of --with-rand-seed=none
   
  > none:   Disable automatic seeding. This is the default
  > on some operating systems where no suitable
  > entropy source exists, or no support for it is
  > implemented yet.

I think when --with-rand-seed=none option is set, the best way to implement 
rand_pool_acquire_entropy should like this:

>size_t rand_pool_acquire_entropy(RAND_POOL *pool)
>{
>  return rand_pool_entropy_available(pool);
>}
>
>int rand_pool_add_nonce_data(RAND_POOL *pool)
>{  
>  // I think PerformanceCounter is an optional nonce.
>  UINT64 data;
>  data = GetPerformanceCounter(); 
>  
>  return rand_pool_add(pool, (unsigned char*), sizeof(data), 0);>}
>
>int rand_pool_add_additional_data(RAND_POOL *pool)
>{
>  return 0;
>}

With this, we handed the Rand_seed work to caller. (caller must provide safe 
seed).

What do you think?

Thanks,
Xiaoyu

-Original Message-
From: Laszlo Ersek [mailto:ler...@redhat.com] 
Sent: Friday, May 17, 2019 12:32 AM
To: devel@edk2.groups.io; Lu, XiaoyuX ; Wang, Jian J 

Cc: Ye, Ting 
Subject: Re: [edk2-devel] [PATCH v4 6/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

Hi Jian,

On 05/16/19 09:54, Xiaoyu lu wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1089
> 
> * Update OpenSSL submodule to OpenSSL_1_1_1b
>OpenSSL_1_1_1b(50eaac9f3337667259de725451f201e784599687)
> 
> * Run process_files.pl script to regenerate OpensslLib[Crypto].inf
>   and opensslconf.h
> 
> * Remove -DNO_SYSLOG from OPENSSL_FLAGS in OpensslLib[Crypto].inf,
>   due to upstream OpenSSL commit cff55b90e95e("Cleaning UEFI
>   Build with additional OPENSSL_SYS_UEFI flags", 2017-03-29),
>   which was first released as part of OpenSSL_1_1_1.
> 
> * Starting with OpenSSL commit 8a8d9e1905(first release in
>   OpenSSL_1_1_1), the OpenSSL_version() function can no longer
>   return a pointer to the string literal "compiler: information
>   not available", in the case CFLAGS macro is not defined.
>   Instead, the function now has a hard dependency on the global
>   variable 'compiler_flags'. This variable is normally placed
>   by "util/mkbuildinf.pl" into "buildinf.h". In edk2 we don't
>   run that script whenever we build OpenSSL, therefore we
>   must provide our own dummy 'compiler_flags'.
> 
> * From OpenSSL_1_1_0i(97c0959f27b294fe1eb10b547145ebef2524b896) to
>   OpenSSL_1_1_1b(50eaac9f3337667259de725451f201e784599687), OpenSSL
>   updated DRBG / RAND to request nonce and additional low entropy
>   randomness from system(line 229 openssl/CHANGES).
> 
>   Since OpenSSL_1_1_1b doesn't fully implement rand pool functions
>   for UEFI. We must provide a method to implenet these method.
>   TSC is used as first entropy source if it's availabe otherwise
>   fallback to TimerLib. But we are not sure the amount of randomness
>   they provide. If you really care about the security, one choice is
>   overrided it with hardware generator.
> 
>   Add rand_pool.c to implement these functions required by OpenSSL
> rand_pool_acquire_entropy
> rand_pool_add_nonce_data
> rand_pool_add_additional_data
> rand_pool_init
> rand_pool_cleanup
> rand_pool_keep_random_devices_open
> 
>   And add rand_pool_noise.* for getting entropy noise from different
>   architecture.
> 
> * We don't need ossl_store functions. We exclude relative files
>   through process_files.pl. And ossl_store_cleanup_int was first
>   added in crypto/init.c OpenSSL_1_1_1(71a5516d).
>   So add a new file(ossl_store.c) to implement ossl_store_cleanup_int
>   function.
> 
> * BUFSIZ is used by crypto/evp/evp_key.c(OpenSSL_1_1_1b)
>   And it is declared in stdio.h. So add it to CrtLibSupport.h.
>   Here's a discussion about this.
>   Ref: https://github.com/openssl/openssl/issues/8904
> 
> Cc: Jian J Wang 
> Cc: Ting Ye 
> Signed-off-by: Xiaoyu Lu 
> ---
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf|  60 +++-
>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf  |  51 +++-
>  CryptoPkg/Library/Include/CrtLibSupport.h  |  13 +-
>  CryptoPkg/Library/Include/openssl/opensslconf.h|  54 +++-
>  CryptoPkg/Library/OpensslLib/buildinf.h|   2 +
>  CryptoPkg/Library/OpensslLib/rand_pool_noise.h |  29 ++
>  CryptoPkg/Library/OpensslLib/ossl_store.c  |  17 ++
>  CryptoPkg/Library/OpensslLib/rand_pool.c   | 316 
> +
>  CryptoPkg/Library/OpensslLib/rand_pool_noise.c |  29 ++
>  CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c |  43 +++
>  CryptoPkg/Library/OpensslLib/openssl   |   2 +-
>  11 files changed, 584 insertions(+), 32 deletions(-)  create mode 
> 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.h
>  create mode 100644

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License

2019-05-17 Thread Ard Biesheuvel

On Fri, 17 May 2019 at 13:07, Leif Lindholm  wrote:
>
> On Wed, May 15, 2019 at 04:09:56PM -0700, Michael D Kinney wrote:
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> >
> > Replace BSD 2-Clause License with BSD+Patent License.  This change is
> > based on the following emails:
> >
> >   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> >   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> >
> > RFCs with detailed process for the license change:
> >
> >   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> >   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> >   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> This excludes the (presumably unintentionally, clarification being
> sought with original author) unlicensed file:
> Platform\RaspberryPi\RPi3\Library\PlatformUiAppLib\PlatformUiAppLib.inf
>
> This would be wort mentioning in the commit message unless the
> situation is resolved before the series is pushed.
>
> It also excludes the 3-clause BSD licensed file
> Platform\RaspberryPi\RPi3\Include\IndustryStandard\RpiMbox.h
> based on work from Ard who suggests that was unintentional.
>
> Ard: can you confirm for the list that this was always intended to be
> 2-clause?
>

Indeed - I inadvertently copy/pasted a version of the license header
from another file that included the ARM non-endorsement clause, but
the intention was to use 2-clause BSD.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40909): https://edk2.groups.io/g/devel/message/40909
Mute This Topic: https://groups.io/mt/31635486/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License

2019-05-17 Thread Ard Biesheuvel

On Fri, 17 May 2019 at 13:08, Leif Lindholm  wrote:
>
> On Wed, May 15, 2019 at 04:10:02PM -0700, Michael D Kinney wrote:
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> >
> > Replace BSD 2-Clause License with BSD+Patent License.  This change is
> > based on the following emails:
> >
> >   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> >   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> >
> > RFCs with detailed process for the license change:
> >
> >   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> >   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> >   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> This patch excludes the 3-clause BSD licensed file
> Silicon\Broadcom\Bcm283x\Include\IndustryStandard\Bcm2836.h
> based on work from Ard who suggests that was unintentional.
>
> Ard: can you confirm for the list that this was always intended to be 
> 2-clause?
>

Indeed - I inadvertently copy/pasted a version of the license header
from another file that included the ARM non-endorsement clause, but
the intention was to use 2-clause BSD.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40911): https://edk2.groups.io/g/devel/message/40911
Mute This Topic: https://groups.io/mt/31635491/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License

2019-05-17 Thread Leif Lindholm

Hi Mike,

Many thanks for this.

For all of the patches you wanted my R-b on apart from the ones I have
commented on individually:
Reviewed-by: Leif Lindholm 

/
Leif

On Wed, May 15, 2019 at 04:09:41PM -0700, Michael D Kinney wrote:
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> This change is based on the following emails:
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> 
> RFCs with detailed process for the license change:
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
> 
> The V2 branch for review for converting the edk2-platforms/master branch to
> the BSD + Patent license is available here:
> 
> https://github.com/mdkinney/edk2-platforms/tree/Bug_1373_BsdPatentLicense_V2
> 
> The list of commits in the series are here:
> 
> https://github.com/mdkinney/edk2-platforms/commits/Bug_1373_BsdPatentLicense_V2
> 
> Cc: Leif Lindholm 
> Cc: Ard Biesheuvel 
> Cc: Thad Gillispie 
> Cc: Daocheng Bu 
> Cc: Isaac W Oram 
> Cc: Maciej Piwko 
> Cc: Chasel Chiu 
> Cc: Michael Kubacki 
> Cc: Shifei A Lu 
> Cc: Xiaohu Zhou 
> Cc: Ankit Sinha 
> Cc: Sai Chaganty 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney 
> 
> Michael D Kinney (30):
>   edk2-platforms: Add License-History.txt
>   edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
>   Platform/96Boards: Replace BSD License with BSD+Patent License
>   Platform/ARM: Replace BSD License with BSD+Patent License
>   Platform/AMD: Replace BSD License with BSD+Patent License
>   Platform/Comcast: Replace BSD License with BSD+Patent License
>   Platform/Hisilicon: Replace BSD License with BSD+Patent License
>   Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent
> License
>   Platform/Intel/ClevoOpenBoardPkg: Replace BSD License with BSD+Patent
> License
>   Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with
> BSD+Patent License
>   Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent
> License
>   Platform/Intel/PurleyOpenBoardPkg: Replace BSD License with BSD+Patent
> License
>   Platform/LeMaker: Replace BSD License with BSD+Patent License
>   Platform/Marvell: Replace BSD License with BSD+Patent License
>   Platform/RaspberryPi: Replace BSD License with BSD+Patent License
>   Platform/Socionext: Replace BSD License with BSD+Patent License
>   Platform/SoftIron: Replace BSD License with BSD+Patent License
>   Platform/SolidRun: Replace BSD License with BSD+Patent License
>   Silicon/AMD: Replace BSD License with BSD+Patent License
>   Silicon/Atmel: Replace BSD License with BSD+Patent License
>   Silicon/Broadcom: Replace BSD License with BSD+Patent License
>   Silicon/Hisilicon: Replace BSD License with BSD+Patent License
>   Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent
> License
>   Silicon/Intel/LewisburgPkg: Replace BSD License with BSD+Patent
> License
>   Silicon/Intel/PurleyRcPkg: Replace BSD License with BSD+Patent License
>   Silicon/Intel/PurleySktPkg: Replace BSD License with BSD+Patent
> License
>   Silicon/Marvell: Replace BSD License with BSD+Patent License
>   Silicon/NXP: Replace BSD License with BSD+Patent License
>   Silicon/Socionext: Replace BSD License with BSD+Patent License
>   edk2-platforms: Remove Contributions.txt and update Readme.md
> 
>  Contributions.txt | 235 
>  License-History.txt   | 542 ++
>  License.txt   |  70 ++-
>  Platform/96Boards/96Boards.dec|   8 +-
>  .../96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c  |   7 +-
>  .../96BoardsI2cDxe/96BoardsI2cDxe.inf |   8 +-
>  Platform/96Boards/Include/Guid/FormSet.h  |   8 +-
>  .../96Boards/Include/Protocol/LsConnector.h   |   8 +-
>  .../96Boards/Include/Protocol/Mezzanine.h |   8 +-
>  .../96Boards/LsConnectorDxe/LsConnectorDxe.c  |   8 +-
>  .../96Boards/LsConnectorDxe/LsConnectorDxe.h  |   8 +-
>  .../LsConnectorDxe/LsConnectorDxe.inf |   9 +-
>  .../LsConnectorDxe/LsConnectorHii.uni |   8 +-
>  .../LsConnectorDxe/LsConnectorHii.vfr |   8 +-
>  Platform/96Boards/Secure96Dxe/Secure96.asl|   9 +-
>  Platform/96Boards/Secure96Dxe/Secure96.dts|   9 +-
>  Platform/96Boards/Secure96Dxe/Secure96.h  |   8 +-
>  Platform/96Boards/Secure96Dxe/Secure96Dxe.c   |   8 +-
>  Platform/96Boards/Secure96Dxe/Secure96Dxe.inf |   8 +-
>  Platform/AMD/License.txt  |  25 -
>  .../DeviceTree/OverdriveBoard.dts |   9 +-
>  .../DeviceTree/OverdriveBoard.inf |   8 +-
>  .../AMD/OverdriveBoard/OverdriveBoard.dsc |   8 +-
>

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License

2019-05-17 Thread Leif Lindholm

On Wed, May 15, 2019 at 04:10:02PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> Replace BSD 2-Clause License with BSD+Patent License.  This change is
> based on the following emails:
> 
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> 
> RFCs with detailed process for the license change:
> 
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

This patch excludes the 3-clause BSD licensed file
Silicon\Broadcom\Bcm283x\Include\IndustryStandard\Bcm2836.h
based on work from Ard who suggests that was unintentional.

Ard: can you confirm for the list that this was always intended to be   
  2-clause?

Regards,

Leif

> Cc: Leif Lindholm 
> Cc: Ard Biesheuvel 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney 
> ---
>  Silicon/Broadcom/Bcm283x/Bcm283x.dec | 9 +
>  .../Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c | 8 +---
>  .../Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf| 8 +---
>  Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c | 8 +---
>  Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf   | 8 +---
>  .../Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h   | 8 +---
>  .../Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h | 8 +---
>  .../Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h   | 8 +---
>  Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h   | 8 +---
>  Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c   | 8 +---
>  Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf | 8 +---
>  11 files changed, 11 insertions(+), 78 deletions(-)
> 
> diff --git a/Silicon/Broadcom/Bcm283x/Bcm283x.dec 
> b/Silicon/Broadcom/Bcm283x/Bcm283x.dec
> index d193da4c0e..ec62ff27fb 100644
> --- a/Silicon/Broadcom/Bcm283x/Bcm283x.dec
> +++ b/Silicon/Broadcom/Bcm283x/Bcm283x.dec
> @@ -2,14 +2,7 @@
>  #
>  #  Copyright (c) 2019, Pete Batard 
>  #
> -#  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.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>  
> diff --git a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c 
> b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
> index 9058aa94ff..a1fe13032f 100644
> --- a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
> +++ b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2016, Linaro, Ltd. 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.
> + *  SPDX-License-Identifier: BSD-2-Clause-Patent
>   *
>   **/
>  
> diff --git a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf 
> b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
> index 5812e48dbb..cdce11a51e 100644
> --- a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
> +++ b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2017, Andrei Warkentin 
>  #  Copyright (c) 2016 Linaro, Ltd. 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.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  #**/
>  
> diff --git a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c 
> b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
> index 399d931585..722815d32f 100644
> --- a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
> +++ b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
> @@ -4,13 +4,7 @@
>  
>

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License

2019-05-17 Thread Leif Lindholm

On Wed, May 15, 2019 at 04:09:56PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> Replace BSD 2-Clause License with BSD+Patent License.  This change is
> based on the following emails:
> 
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> 
> RFCs with detailed process for the license change:
> 
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

This excludes the (presumably unintentionally, clarification being
sought with original author) unlicensed file:
Platform\RaspberryPi\RPi3\Library\PlatformUiAppLib\PlatformUiAppLib.inf

This would be wort mentioning in the commit message unless the
situation is resolved before the series is pushed.

It also excludes the 3-clause BSD licensed file
Platform\RaspberryPi\RPi3\Include\IndustryStandard\RpiMbox.h
based on work from Ard who suggests that was unintentional.

Ard: can you confirm for the list that this was always intended to be
2-clause?

Regards,

Leif

> Cc: Leif Lindholm 
> Cc: Ard Biesheuvel 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney 
> ---
>  Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h| 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf  | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc   | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc   | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl| 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc   | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc   | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc   | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Pep.c   | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Pep.h   | 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl| 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl| 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl| 8 +---
>  Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl| 8 +---
>  .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c | 8 +---
>  .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h | 8 +---
>  .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf   | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c  | 8 +---
>  .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf | 9 +
>  .../RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h| 8 +---
>  .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni  | 8 +---
>  .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr  | 8 +---
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c  | 8 +---
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c | 8 +---
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h | 8 +---
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf   | 8 +---
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c | 8 +---
>  .../RPi3/Drivers/DwUsbHostDxe/ComponentName.c| 8 +---
>  .../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c| 8 +---
>  .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +---
>  .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +---
>  .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf   | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h   | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c| 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf  | 8 +---
>  .../RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c  | 8 +---
>  .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c| 8 +---
>  .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h| 8 +---
>  .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf| 9 +
>  .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni| 8 +---
>  .../GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni   | 8 +---
>  .../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c| 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c   | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c   | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h   | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c| 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c  | 8 +---
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: Replace BSD License with BSD+Patent License

2019-05-17 Thread Leif Lindholm

On Wed, May 15, 2019 at 04:09:48PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> Replace BSD 2-Clause License with BSD+Patent License.  This change is
> based on the following emails:
> 
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> 
> RFCs with detailed process for the license change:
> 
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

As far as I can tell, this excludes 4 (iasl generated) .asl files
currently not displaying any explicit license at all.

This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.

Ming, Heyi - can you confirm that:

Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl

were intended to be contributed with a 2-clause BSD license and under
TianoCore Contribution Agreement 1.1?

Other than that, looks good to me.

/
Leif

> Cc: Leif Lindholm 
> Cc: Ard Biesheuvel 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney 
> ---
>  .../SystemFirmwareUpdateConfig.ini|   8 +---
>  Platform/Hisilicon/D03/D03.dec|   8 +---
>  Platform/Hisilicon/D03/D03.dsc|   8 +---
>  Platform/Hisilicon/D03/D03.fdf|   8 +---
>  .../OemNicConfig2PHi1610/OemNicConfig.h   |   8 +---
>  .../OemNicConfig2PHi1610/OemNicConfig2P.c |   8 +---
>  .../OemNicConfig2PHi1610/OemNicConfig2P.inf   |   8 +---
>  .../SystemFirmwareDescriptor.aslc |   8 +---
>  .../SystemFirmwareDescriptor.inf  |   8 +---
>  .../SystemFirmwareDescriptorPei.c |   8 +---
>  .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c  |   8 +---
>  .../EarlyConfigPeim/EarlyConfigPeimD03.inf|   8 +---
>  .../Hisilicon/D03/Include/Library/CpldD03.h   |   8 +---
>  .../DS3231RealTimeClock.h |   8 +---
>  .../DS3231RealTimeClockLib.c  |   8 +---
>  .../DS3231RealTimeClockLib.inf|   7 +--
>  .../D03/Library/FdtUpdateLib/FdtUpdateLib.c   |   8 +---
>  .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf |   8 +---
>  .../OemMiscLib2P/BoardFeature2PHi1610.c   |   8 +---
>  .../BoardFeature2PHi1610Strings.uni   | Bin 4292 -> 3538 bytes
>  .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c |   8 +---
>  .../OemMiscLib2P/OemMiscLib2PHi1610.inf   |   8 +---
>  .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +---
>  .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +--
>  .../SystemFirmwareUpdateConfig.ini|   8 +---
>  Platform/Hisilicon/D05/D05.dsc|   8 +---
>  Platform/Hisilicon/D05/D05.fdf|   8 +---
>  .../SystemFirmwareDescriptor.aslc |   8 +---
>  .../SystemFirmwareDescriptor.inf  |   8 +---
>  .../SystemFirmwareDescriptorPei.c |   8 +---
>  .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c  |   8 +---
>  .../EarlyConfigPeim/EarlyConfigPeimD05.inf|   8 +---
>  .../Library/OemMiscLibD05/BoardFeatureD05.c   |   8 +---
>  .../OemMiscLibD05/BoardFeatureD05Strings.uni  |   8 +---
>  .../D05/Library/OemMiscLibD05/OemMiscLibD05.c |   8 +---
>  .../Library/OemMiscLibD05/OemMiscLibD05.inf   |   8 +---
>  .../Library/PlatformPciLib/PlatformPciLib.c   |   8 +---
>  .../Library/PlatformPciLib/PlatformPciLib.inf |   7 +--
>  .../SystemFirmwareUpdateConfig.ini|   8 +---
>  Platform/Hisilicon/D06/D06.dec|   8 +---
>  Platform/Hisilicon/D06/D06.dsc|   8 +---
>  Platform/Hisilicon/D06/D06.fdf|   8 +---
>  .../OemNicConfig2PHi1620/OemNicConfig.h   |   8 +---
>  .../OemNicConfig2PHi1620/OemNicConfig2P.c |   8 +---
>  .../OemNicConfig2PHi1620/OemNicConfig2P.inf   |   8 +---
>  .../SystemFirmwareDescriptor.aslc |   8 +---
>  .../SystemFirmwareDescriptor.inf  |   8 +---
>  .../SystemFirmwareDescriptorPei.c |   8 +---
>  .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c  |   8 +---
>  .../EarlyConfigPeim/EarlyConfigPeimD06.inf|   8 +---
>  .../Hisilicon/D06/Include/Library/CpldD06.h   |   8 +---
>  .../Library/OemMiscLibD06/BoardFeatureD06.c   |   8 +---
>  .../OemMiscLibD06/BoardFeatureD06Strings.uni  |   8 +---
>  .../D06/Library/OemMiscLibD06/OemMiscLibD06.c |   8 +---
>  .../Library/OemMiscLibD06/OemMiscLibD06.inf   |   8 +---
>

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: Replace BSD License with BSD+Patent License

2019-05-17 Thread Leif Lindholm

On Wed, May 15, 2019 at 04:09:55PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> Replace BSD 2-Clause License with BSD+Patent License.  This change is
> based on the following emails:
> 
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> 
> RFCs with detailed process for the license change:
> 
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

As far as I can tell, this excludes the source files currently
licensed under 3-clause BSD (2-clause plus non-endorsement clause).

This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.

(Conversations about relicensing the 3-clause files are happening in
the background.)

Other than that, looks good to me.

/
Leif

> Cc: Leif Lindholm 
> Cc: Ard Biesheuvel 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney 
> ---
>  Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc| 8 +---
>  .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c   | 8 +---
>  .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf | 8 +---
>  .../NonDiscoverableInitLib/NonDiscoverableInitLib.c   | 8 +---
>  .../NonDiscoverableInitLib/NonDiscoverableInitLib.h   | 8 +---
>  .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +---
>  Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc| 8 +---
>  .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c   | 8 +---
>  .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf | 8 +---
>  .../NonDiscoverableInitLib/NonDiscoverableInitLib.c   | 8 +---
>  .../NonDiscoverableInitLib/NonDiscoverableInitLib.h   | 8 +---
>  .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +---
>  12 files changed, 12 insertions(+), 84 deletions(-)
> 
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc 
> b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> index 712960636d..77e8b11bf5 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> @@ -1,13 +1,7 @@
>  #
>  #  Copyright (C) 2018 Marvell International Ltd. and its affiliates
>  #
> -#  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.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  
>  # Per-board additional content of the DXE phase firmware volume
> diff --git 
> a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
>  
> b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
> index f0133ec253..dbd434ff96 100644
> --- 
> a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
> +++ 
> b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
> @@ -2,13 +2,7 @@
>  *
>  *  Copyright (C) 2018, Marvell International Ltd. and its affiliates.
>  *
> -*  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.
> +*  SPDX-License-Identifier: BSD-2-Clause-Patent
>  *
>  **/
>  
> diff --git 
> a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
>  
> b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
> index c995515064..20294ab43b 100644
> --- 
> a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
> +++ 
> b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
> @@ -2,13 +2,7 @@
>  #
>  #  Copyright (C) 2018, Marvell International Ltd. and its affiliates
>  #
> -#  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,
>

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Xiaoyu Lu

Hi, Lerszlo:

(1):

> Unfortunately, I've found another build issue with this series. (My apologies 
> that I didn't discover it earlier.) It is reported in the 32-bit (ARM) build 
> of the ArmVirtQemu platform:
> 
>   CryptoPkg/Library/OpensslLib/openssl/crypto/rand/drbg_lib.c:1028:
>   undefined reference to `__aeabi_ui2d'
> 

OpensslLib[Crypto].inf contains ArmSoftFloatLib as dependent library.

In ArmSoftFloatLib:

 softfloat-for-gcc.h|98| #define uint32_to_float64   __floatunsidf
 softfloat-for-gcc.h|222| #define __floatunsidf   __aeabi_ui2d

 softfloat-for-gcc.h|128| #define float64_to_uint32_round_to_zero 
__fixunsdfsi
 softfloat-for-gcc.h|234| #define __fixunsdfsi__aeabi_d2uiz

But *uint32_to_float64* and *float64_to_uint32_round_to_zero* aren't 
implemented in softfloat.c

If these two functions implement, the build will pass. (I use dummy functions 
and try)


(2):

>thus, preferably, a CryptoPkg patch series should be at least build tested (if 
>not boot tested) for all arches, before being posted to the mailing list.

I should test ARM, since IA32 arch has Intrinsic problem(_ftol2). It is very 
likely that ARM arch does not support it either. 

>(Yes, CI would help a lot with such issues.)

Now I don't have a CI environment here. 
I will setup one for building OvmfPkg, ArmVirtPkg, EmulatorPkg.

Thanks,
Xiaoyu

-Original Message-
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Laszlo 
Ersek
Sent: Friday, May 17, 2019 2:26 AM
To: devel@edk2.groups.io; Lu, XiaoyuX 
Cc: Wang, Jian J ; Ye, Ting ; Ard 
Biesheuvel ; Leif Lindholm 
Subject: Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

Hi,

(+ Ard and Leif)

On 05/16/19 09:54, Xiaoyu lu wrote:
> This series is also available at:
> https://github.com/xiaoyuxlu/edk2/tree/bz_1089_upgrade_to_openssl_1_1_
> 1b_v4
> 
> Changes:
> 
> (1) CryptoPkgOpensslLib: Modify process_files.pl for  upgrading 
> OpenSSL
> 
> (2) CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
> crypto/store/* are excluded.
> crypto/rand/randfile.c is excluded.
> 
> (3) CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol 
> issue
> 
> (4) CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
> Disable warnings for buiding OpenSSL_1_1_1b
> 
> (5) CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
> 
> (6) CryptoPkg: Upgrade OpenSSL to 1.1.1b
> The biggest change is use TSC as entropy source
> If TSC isn't avaiable, fallback to TimerLib(PerformanceCounter).
> 
> (7) CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
> 
> 
> Verification done for this series:
> * Https boot in OvmfPkg.
> * BaseCrypt Library test. (Ovmf, EmulatorPkg)
> 
> Important notice:
> Nt32Pkg doesn't support TimerLib
>> TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemp
>> TimerLib|late.inf
> So it will failed in Nt32Pkg.
> 
> Cc: Jian J Wang 
> Cc: Ting Ye 
> 
> Laszlo Ersek (1):
>   CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
> 
> Xiaoyu Lu (6):
>   CryptoPkg/OpensslLib: Modify process_files.pl for upgrading OpenSSL
>   CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
>   CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
>   CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
>   CryptoPkg: Upgrade OpenSSL to 1.1.1b
>   CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
> 
>  CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf|   4 +-
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf|  76 -
>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf  |  67 -
>  CryptoPkg/Library/Include/CrtLibSupport.h  |  13 +-
>  CryptoPkg/Library/Include/openssl/opensslconf.h|  54 +++-
>  CryptoPkg/Library/Include/sys/syscall.h|  11 +
>  CryptoPkg/Library/OpensslLib/buildinf.h|   2 +
>  CryptoPkg/Library/OpensslLib/rand_pool_noise.h |  29 ++
>  CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c |   8 +-
>  .../Library/BaseCryptLib/Hmac/CryptHmacSha1.c  |   9 +-
>  .../Library/BaseCryptLib/Hmac/CryptHmacSha256.c|   8 +-
>  CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c |  22 ++
>  CryptoPkg/Library/OpensslLib/ossl_store.c  |  17 ++
>  CryptoPkg/Library/OpensslLib/rand_pool.c   | 316 
> +
>  CryptoPkg/Library/OpensslLib/rand_pool_noise.c |  29 ++
>  CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c |  43 +++
>  CryptoPkg/Library/OpensslLib/openssl   |   2 +-
>  CryptoPkg/Library/OpensslLib/process_files.pl  |  11 +-
>  18 files changed, 669 insertions(+), 52 deletions(-)  create mode 
> 100644 CryptoPkg/Library/Include/sys/syscall.h
>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.h
>  create mode 100644 CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
>  create mode 100644 CryptoPkg/Library/OpensslLib/ossl_store.c
>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool.c
>

Re: [edk2-devel] [edk2-announce] [RFC] EMEA Meeting Days / Times Change

2019-05-17 Thread Ni, Ray



> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Laszlo
> Ersek
> Sent: Wednesday, May 15, 2019 5:29 PM
> To: Stephano Cetola 
> Cc: edk2-devel-groups-io 
> Subject: Re: [edk2-devel] [edk2-announce] [RFC] EMEA Meeting Days /
> Times Change
> 
> Hi Stephano,
> 
> On 05/14/19 20:21, Stephano Cetola wrote:
> > It was mentioned that posting RFCs to the announce mailing list means
> > folks will need the ability to post.
> >
> > I agree that announcements can lead to conversation and so I've opened
> > up the announce list to posting. New user moderation is active so I'll
> > need to approve your first post.
> 
> I'm somewhat used to announce lists, and I'd like to propose an alternative
> that has worked well on those lists.
> 
> Namely:
> 
> - keep the announce list locked down (very small number of posters allowed)
> - when making an announcement, always CC the devel list as well,
> - when consensus is reached, send *one* update (as the original poster) in
> response to the original email, again to both lists.
> 
> As a result:
> 
> - the announce list will only contain the announcements, and (if
> necessary) a consensus update. This will offer a very clean and low-traffic
> overview to people browsing the announce list, and to those that are
> subscribed only to the announce list
> 
> - the community can engage in normal discussion hitting "Reply All" at all
> times. The discussion will occur on the devel list, and will be kept out of 
> the
> announce list. If you (the OP) partake in the discussion, you'll have to take
> care to remove the announce list from the address list of your emails, as the
> address list would not filter you out (and you wouldn't want to clutter the
> announce list with in-flight discussion).
> 
> Only a suggestion of course.

Laszlo,
That's a good idea to remove email traffic!

> 
> Thanks
> Laszlo
> 
> > On 5/14/2019 7:57 AM, Stephano Cetola wrote:
> >> Some folks from the EMEA region have mentioned that the days and
> >> times for their meetings are not ideal. We'd like to be sure that as
> >> many people from this region can attend as possible. As such, I'll be
> >> sending out an anonymous poll to determine the best day / time to
> >> hold meetings. We will start with the *Design* meeting, as I have not
> >> been getting a lot of designs from that region. :)
> >>
> >> To accommodate both North America and EMEA, we will restrict
> >> ourselves to times after 14:00 GMT. The days are less restrictive,
> >> though Friday is not an option, as that would begin to encroach on
> people's weekend.
> >>
> >> The first poll will help us select a good day (Mon - Thurs) and the
> >> next poll will select a time (14:00 GMT - 17:00GMT). I will give each
> >> poll 48 hours. After the design meeting we will repeat for bug
> >> triage, and finally for the community meeting.
> >>
> >> It is vital that folks in this region respond to the poll, so if for
> >> any reason we need to extend it please let me know.
> >>
> >> Please feel free to use this thread for comments and questions.
> >>
> >> Cheers,
> >> Stephano
> >>
> >>
> >>
> >
> >
> >
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40901): https://edk2.groups.io/g/devel/message/40901
Mute This Topic: https://groups.io/mt/31628023/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] Maintainers.txt: Remove Nt32Pkg reference after Nt32Pkg is removed

2019-05-17 Thread Leif Lindholm

No problem, I just wanted to make sure that if you were waiting for an
R-b from a steward, you had one.

Regards,

Leif

On Fri, May 17, 2019 at 09:00:43AM +, Ni, Ray wrote:
> Leif,
> Thanks for your "Reviewed-by".
> The Maintainers.txt change was pushed before I saw this mail.
> Sorry that I missed your "Reviewed-by".
> 
> Thanks,
> Ray
> 
> > -Original Message-
> > From: Leif Lindholm 
> > Sent: Friday, May 17, 2019 4:44 PM
> > To: Ni, Ray 
> > Cc: devel@edk2.groups.io; Gao, Liming ; Andrew
> > Fish ; Laszlo Ersek ; Kinney,
> > Michael D 
> > Subject: Re: [PATCH] Maintainers.txt: Remove Nt32Pkg reference after
> > Nt32Pkg is removed
> > 
> > On Fri, May 17, 2019 at 12:57:35PM +0800, Ray Ni wrote:
> > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > Signed-off-by: Ray Ni 
> > > Cc: Liming Gao 
> > > Cc: Andrew Fish 
> > > Cc: Laszlo Ersek 
> > > Cc: Leif Lindholm 
> > > Cc: Michael D Kinney 
> > 
> > Reviewed-by: Leif Lindholm 
> > 
> > > ---
> > >  Maintainers.txt | 7 +--
> > >  1 file changed, 1 insertion(+), 6 deletions(-)
> > >
> > > diff --git a/Maintainers.txt b/Maintainers.txt index
> > > 7315241b6e..de0b6a284e 100644
> > > --- a/Maintainers.txt
> > > +++ b/Maintainers.txt
> > > @@ -1,4 +1,4 @@
> > > -EDK II Maintainers
> > > +EDK II Maintainers
> > >  ==
> > >
> > >  This file provides information about the primary maintainers for @@
> > > -185,11 +185,6 @@ W:
> > > https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
> > >  M: Siyuan Fu 
> > >  M: Jiaxin Wu 
> > >
> > > -Nt32Pkg
> > > -W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
> > > -M: Ray Ni 
> > > -M: Hao A Wu 
> > > -
> > >  OvmfPkg
> > >  W: http://www.tianocore.org/ovmf/
> > >  M: Jordan Justen 
> > > --
> > > 2.21.0.windows.1
> > >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40900): https://edk2.groups.io/g/devel/message/40900
Mute This Topic: https://groups.io/mt/31651955/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v4 0/7] CryptoPkg: Upgrade OpenSSL to 1.1.1b

2019-05-17 Thread Gary Lin

On Thu, May 16, 2019 at 03:54:51AM -0400, Xiaoyu lu wrote:
> This series is also available at:
> https://github.com/xiaoyuxlu/edk2/tree/bz_1089_upgrade_to_openssl_1_1_1b_v4
> 
> Changes:
> 
> (1) CryptoPkgOpensslLib: Modify process_files.pl for  upgrading OpenSSL
> 
> (2) CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
> crypto/store/* are excluded.
> crypto/rand/randfile.c is excluded.
> 
> (3) CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
> 
> (4) CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
> Disable warnings for buiding OpenSSL_1_1_1b
> 
> (5) CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
> 
> (6) CryptoPkg: Upgrade OpenSSL to 1.1.1b
> The biggest change is use TSC as entropy source
> If TSC isn't avaiable, fallback to TimerLib(PerformanceCounter).
> 
> (7) CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
> 
> 
> Verification done for this series:
> * Https boot in OvmfPkg.
> * BaseCrypt Library test. (Ovmf, EmulatorPkg)
> 
My https boot test with ovmf looks good. The connection was rejected as
expected when the server certificate wasn't enrolled. The bootloader
images were downloaded after adding the certificate, and I can boot into
the installation UI in the end.

I skipped the test for aavmf since TLS is still not enabled.

For the series.
Tested-by: Gary Lin 

> Important notice:
> Nt32Pkg doesn't support TimerLib
> > TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
> So it will failed in Nt32Pkg.
> 
> Cc: Jian J Wang 
> Cc: Ting Ye 
> 
> Laszlo Ersek (1):
>   CryptoPkg/OpensslLib: Fix cross-build problem for AARCH64
> 
> Xiaoyu Lu (6):
>   CryptoPkg/OpensslLib: Modify process_files.pl for upgrading OpenSSL
>   CryptoPkg/OpensslLib: Exclude unnecessary files in process_files.pl
>   CryptoPkg/IntrinsicLib: Fix possible unresolved external symbol issue
>   CryptoPkg/OpensslLib: Prepare for upgrading OpenSSL
>   CryptoPkg: Upgrade OpenSSL to 1.1.1b
>   CryptoPkg/BaseCryptLib: Make HMAC_CTX size backward compatible
> 
>  CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf|   4 +-
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf|  76 -
>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf  |  67 -
>  CryptoPkg/Library/Include/CrtLibSupport.h  |  13 +-
>  CryptoPkg/Library/Include/openssl/opensslconf.h|  54 +++-
>  CryptoPkg/Library/Include/sys/syscall.h|  11 +
>  CryptoPkg/Library/OpensslLib/buildinf.h|   2 +
>  CryptoPkg/Library/OpensslLib/rand_pool_noise.h |  29 ++
>  CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c |   8 +-
>  .../Library/BaseCryptLib/Hmac/CryptHmacSha1.c  |   9 +-
>  .../Library/BaseCryptLib/Hmac/CryptHmacSha256.c|   8 +-
>  CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c |  22 ++
>  CryptoPkg/Library/OpensslLib/ossl_store.c  |  17 ++
>  CryptoPkg/Library/OpensslLib/rand_pool.c   | 316 
> +
>  CryptoPkg/Library/OpensslLib/rand_pool_noise.c |  29 ++
>  CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c |  43 +++
>  CryptoPkg/Library/OpensslLib/openssl   |   2 +-
>  CryptoPkg/Library/OpensslLib/process_files.pl  |  11 +-
>  18 files changed, 669 insertions(+), 52 deletions(-)
>  create mode 100644 CryptoPkg/Library/Include/sys/syscall.h
>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.h
>  create mode 100644 CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c
>  create mode 100644 CryptoPkg/Library/OpensslLib/ossl_store.c
>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool.c
>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise.c
>  create mode 100644 CryptoPkg/Library/OpensslLib/rand_pool_noise_tsc.c
> 
> -- 
> 2.7.4
> 
> 
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40899): https://edk2.groups.io/g/devel/message/40899
Mute This Topic: https://groups.io/mt/31638503/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] Maintainers.txt: Remove Nt32Pkg reference after Nt32Pkg is removed

2019-05-17 Thread Ni, Ray

Leif,
Thanks for your "Reviewed-by".
The Maintainers.txt change was pushed before I saw this mail.
Sorry that I missed your "Reviewed-by".

Thanks,
Ray

> -Original Message-
> From: Leif Lindholm 
> Sent: Friday, May 17, 2019 4:44 PM
> To: Ni, Ray 
> Cc: devel@edk2.groups.io; Gao, Liming ; Andrew
> Fish ; Laszlo Ersek ; Kinney,
> Michael D 
> Subject: Re: [PATCH] Maintainers.txt: Remove Nt32Pkg reference after
> Nt32Pkg is removed
> 
> On Fri, May 17, 2019 at 12:57:35PM +0800, Ray Ni wrote:
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Ray Ni 
> > Cc: Liming Gao 
> > Cc: Andrew Fish 
> > Cc: Laszlo Ersek 
> > Cc: Leif Lindholm 
> > Cc: Michael D Kinney 
> 
> Reviewed-by: Leif Lindholm 
> 
> > ---
> >  Maintainers.txt | 7 +--
> >  1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/Maintainers.txt b/Maintainers.txt index
> > 7315241b6e..de0b6a284e 100644
> > --- a/Maintainers.txt
> > +++ b/Maintainers.txt
> > @@ -1,4 +1,4 @@
> > -EDK II Maintainers
> > +EDK II Maintainers
> >  ==
> >
> >  This file provides information about the primary maintainers for @@
> > -185,11 +185,6 @@ W:
> > https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
> >  M: Siyuan Fu 
> >  M: Jiaxin Wu 
> >
> > -Nt32Pkg
> > -W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
> > -M: Ray Ni 
> > -M: Hao A Wu 
> > -
> >  OvmfPkg
> >  W: http://www.tianocore.org/ovmf/
> >  M: Jordan Justen 
> > --
> > 2.21.0.windows.1
> >

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40898): https://edk2.groups.io/g/devel/message/40898
Mute This Topic: https://groups.io/mt/31651955/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch 2/2] EmbeddedPkg: Update DSC to use NetworkPkg's include fragment file

2019-05-17 Thread Leif Lindholm

On Fri, May 17, 2019 at 04:50:35PM +0800, Liming Gao wrote:
> Signed-off-by: Liming Gao 
> Cc: Leif Lindholm 
> Cc: Ard Biesheuvel 

Reviewed-by: Leif Lindholm 

> ---
>  EmbeddedPkg/EmbeddedPkg.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
> index b487337909..863bce3a19 100644
> --- a/EmbeddedPkg/EmbeddedPkg.dsc
> +++ b/EmbeddedPkg/EmbeddedPkg.dsc
> @@ -96,7 +96,7 @@ [LibraryClasses.common]
>SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>  
># Networking Requirements
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> +  !include NetworkPkg/NetworkLibs.dsc.inc
>HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>
> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
>  
> -- 
> 2.13.0.windows.1
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40897): https://edk2.groups.io/g/devel/message/40897
Mute This Topic: https://groups.io/mt/31653119/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [Patch 1/2] ShellPkg: Update DSC to use NetworkPkg's include fragment file

2019-05-17 Thread Liming Gao

Signed-off-by: Liming Gao 
Cc: Zhichao Gao 
Cc: Ray Ni 
Cc: Jaben Carsey 
---
 ShellPkg/ShellPkg.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 50d9bbb235..6a139b3b91 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -40,7 +40,7 @@ [LibraryClasses.common]
   
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  !include NetworkPkg/NetworkLibs.dsc.inc
 
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40894): https://edk2.groups.io/g/devel/message/40894
Mute This Topic: https://groups.io/mt/31653118/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [Patch 2/2] EmbeddedPkg: Update DSC to use NetworkPkg's include fragment file

2019-05-17 Thread Liming Gao

Signed-off-by: Liming Gao 
Cc: Leif Lindholm 
Cc: Ard Biesheuvel 
---
 EmbeddedPkg/EmbeddedPkg.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index b487337909..863bce3a19 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -96,7 +96,7 @@ [LibraryClasses.common]
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
   # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  !include NetworkPkg/NetworkLibs.dsc.inc
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
 
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40895): https://edk2.groups.io/g/devel/message/40895
Mute This Topic: https://groups.io/mt/31653119/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [Patch 0/2] Update Package DSC to use NetworkPkg's include fragment file

2019-05-17 Thread Liming Gao

Liming Gao (2):
  ShellPkg: Update DSC to use NetworkPkg's include fragment file
  EmbeddedPkg: Update DSC to use NetworkPkg's include fragment file

 EmbeddedPkg/EmbeddedPkg.dsc | 2 +-
 ShellPkg/ShellPkg.dsc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40893): https://edk2.groups.io/g/devel/message/40893
Mute This Topic: https://groups.io/mt/31653117/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] Maintainers.txt: Remove Nt32Pkg reference after Nt32Pkg is removed

2019-05-17 Thread Leif Lindholm

On Fri, May 17, 2019 at 12:57:35PM +0800, Ray Ni wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ray Ni 
> Cc: Liming Gao 
> Cc: Andrew Fish 
> Cc: Laszlo Ersek 
> Cc: Leif Lindholm 
> Cc: Michael D Kinney 

Reviewed-by: Leif Lindholm 

> ---
>  Maintainers.txt | 7 +--
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index 7315241b6e..de0b6a284e 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -1,4 +1,4 @@
> -EDK II Maintainers
> +EDK II Maintainers
>  ==
>  
>  This file provides information about the primary maintainers for
> @@ -185,11 +185,6 @@ W: 
> https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg
>  M: Siyuan Fu 
>  M: Jiaxin Wu 
>  
> -Nt32Pkg
> -W: https://github.com/tianocore/tianocore.github.io/wiki/Nt32Pkg
> -M: Ray Ni 
> -M: Hao A Wu 
> -
>  OvmfPkg
>  W: http://www.tianocore.org/ovmf/
>  M: Jordan Justen 
> -- 
> 2.21.0.windows.1
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40892): https://edk2.groups.io/g/devel/message/40892
Mute This Topic: https://groups.io/mt/31651955/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platform][PATCH v3] MinPlatformPkg: Add multiple segment support for PciHostBridgeLib

2019-05-17 Thread Kubacki, Michael A

Reviewed-by: Michael Kubacki 

> -Original Message-
> From: Chen, Marc W
> Sent: Friday, May 17, 2019 12:53 AM
> To: devel@edk2.groups.io
> Cc: Chen, Marc W ; Kubacki, Michael A
> ; Chaganty, Rangasai V
> 
> Subject: [edk2-platform][PATCH v3] MinPlatformPkg: Add multiple segment
> support for PciHostBridgeLib
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1799
> 
> 1. Add PcdPciSegmentCount PCD in MinPlatformPkg.dec and set default to
> 1 2. Base on PciHostBridge related PCDs to Initialize RootBridges.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marc Chen 
> Cc: Michael Kubacki 
> Cc: Sai Chaganty 
> ---
>  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec   |  3 +-
>  .../PciHostBridgeLibSimple.c   | 83 
> ++
>  .../PciHostBridgeLibSimple.inf |  4 +-
>  3 files changed, 59 insertions(+), 31 deletions(-)
> 
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> index 3185776ac3..e1ae8004cb 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> @@ -6,7 +6,7 @@
>  # INF files to generate AutoGen.c and AutoGen.h files  # for the build
> infrastructure.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2017 - 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.
> @@ -223,6 +223,7 @@
> gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x9000
> 0019
>gMinPlatformPkgTokenSpaceGuid.PcdPciDmaAbove4G
> |FALSE|BOOLEAN|0x4001004B
>gMinPlatformPkgTokenSpaceGuid.PcdPciNoExtendedConfigSpace
> |FALSE|BOOLEAN|0x4001004C
>gMinPlatformPkgTokenSpaceGuid.PcdPciResourceAssigned
> |FALSE|BOOLEAN|0x4001004D
> +  gMinPlatformPkgTokenSpaceGuid.PcdPciSegmentCount |0x1
> |UINT8|0x4001004E
> 
> 
> gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x180
> 0|UINT16|0x00010035
> 
> gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x
> |UINT16|0x00010036
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciH
> ostBridgeLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciH
> ostBridgeLibSimple.c
> index 557ac2a5b3..25259e2f2d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciH
> ostBridgeLibSimple.c
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/P
> +++ ciHostBridgeLibSimple.c
> @@ -1,7 +1,7 @@
>  /** @file
> -  SA PciHostBridge Library
> +  PciHostBridge Library
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 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 @@ -15,6 +15,7 @@ WITHOUT
> WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include   #include 
> @@ -28,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
>  GLOBAL_REMOVE_IF_UNREFERENCED CHAR16
> *mPciHostBridgeLibAcpiAddressSpaceTypeStr[] = {
>L"Mem", L"I/O", L"Bus"
>  };
> -ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
> +ACPI_HID_DEVICE_PATH mRootBridgeDeviceNodeTemplate = {
>{
>  ACPI_DEVICE_PATH,
>  ACPI_DP,
> @@ -41,7 +42,7 @@ ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
>0
>  };
> 
> -PCI_ROOT_BRIDGE mRootBridge = {
> +PCI_ROOT_BRIDGE mRootBridgeTemplate = {
>0,
>EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |
>EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO |
> @@ -66,41 +67,67 @@ PCI_ROOT_BRIDGE mRootBridge = {
>NULL // DevicePath;
>  };
> 
> +/**
> +  Return all the root bridge instances.
> +
> +  @param Count  Return the count of root bridge instances.
> +
> +  @return All the root bridge instances, it will be NULL if system has
> insufficient memory
> +  resources available and count will be zero.
> +**/
> +
>  PCI_ROOT_BRIDGE *
>  EFIAPI
>  PciHostBridgeGetRootBridges (
>UINTN *Count
>)
>  {
> -  mRootBridge.Mem.Base = PcdGet32 (PcdPciReservedMemBase);
> +  UINT8 Index;
> +  PCI_ROOT_BRIDGE *RootBridge;
> +
> +  RootBridge = AllocateZeroPool (sizeof (PCI_ROOT_BRIDGE) * PcdGet8
> + (PcdPciSegmentCount));  if (RootBridge == NULL) {
> +DEBUG ((DEBUG_ERROR, "PciHostBridge: Out of resource\n"));
> +*Count = 0;
> +return RootBridge;
> +  }
> +
> +  mRootBridgeTemplate.Mem.Base = PcdGet32
> (PcdPciReservedMemBase);
>if (PcdGet32(PcdPciReservedMemLimit) != 0) {
> -mRootBridge.Mem.Limit

[edk2-devel] [edk2-platforms: PATCH] Marvell/Armada7k8k: Introduce SMBIOS/DMI support

2019-05-17 Thread Marcin Wojtas

Fill in the basic requirements of the SMBIOS specification by specifying
the minimum required structures. The basic fixup is performed.
CPU/DRAM frequency is obtained via SampleAtResetlib and the DRAM size
is calculated from the information stored in the HOB list.

Add new Armada SmbiosPlatformDxe and MdeModulePkg/SmbiosDxe to the
build and firmware image. With these changes, the EFI BDS, EFI shell,
and Linux dmidecode command return useful information.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas 
---
Hi,

I push the support as a single patch. I plan to add more detailed
fixup, using BoardDescProtocol, but I'll add it after PCIE is merged.

In order to ease review, the patch is available in the github:
https://github.com/MarvellEmbeddedProcessors/edk2-open-platform/commits/smbios-upstream-r20190517

Looking forward to your comments.

Best regards,
Marcin

 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc   |   9 +
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf   |   4 +
 Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf |  60 ++
 Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c   | 787 

 4 files changed, 860 insertions(+)
 create mode 100644 
Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 create mode 100644 
Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc 
b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 3c685b3..0c13045 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -395,6 +395,11 @@
   gMarvellTokenSpaceGuid.PcdOpTeeRegionBase|0x440
   gMarvellTokenSpaceGuid.PcdOpTeeRegionSize|0x100
 
+  # SMBIOS/DMI
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0300
+
   # TRNG
   gMarvellTokenSpaceGuid.PcdEip76TrngBaseAddress|0xF276
 
@@ -619,6 +624,10 @@
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
+  # SMBIOS/DMI
+  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+  Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+
 [Components.AARCH64]
   #
   # Generic ACPI modules
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf 
b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index 2f4b810..1fbc744 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -221,6 +221,10 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   # DTB
   INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
 
+  # SMBIOS/DMI
+  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+  INF Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+
 !if $(ARCH) == AARCH64
   # ACPI support
   INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
diff --git a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf 
b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
new file mode 100644
index 000..b81cac9
--- /dev/null
+++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -0,0 +1,60 @@
+#/** @file
+#  SMBIOS Table for ARM platform
+#
+#  Copyright (c) 2013, Linaro Ltd. All rights reserved.
+#  Copyright (c) 2018, Marvell International Ltd. and its affiliates
+#
+#  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.
+#
+#**/
+
+[Defines]
+  INF_VERSION= 0x0001001B
+  BASE_NAME  = SmbiosPlatformDxe
+  FILE_GUID  = 1c5028a4-3bd0-43cf-9e56-b450584dc22b
+  MODULE_TYPE= DXE_DRIVER
+  VERSION_STRING = 1.0
+  ENTRY_POINT= SmbiosPlatformDriverEntryPoint
+
+[Sources]
+  SmbiosPlatformDxe.c
+
+[Packages]
+  ArmPkg/ArmPkg.dec
+  ArmPlatformPkg/ArmPlatformPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
+  Silicon/Marvell/Marvell.dec
+
+[LibraryClasses]
+  ArmLib
+  BaseLib
+  BaseMemoryLib
+  DebugLib
+  HobLib
+  IoLib
+  MemoryAllocationLib
+  PcdLib
+  SampleAtResetLib
+  UefiBootServicesTableLib
+  UefiDriverEntryPoint
+
+[Guids]
+  gEfiGlobalVariableGuid
+
+[FixedPcd]
+  gArmTokenSpaceGuid.PcdSystemMemoryBase
+  gArmTokenSpaceGuid.PcdSystemMemorySize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
+
+[Protocols]
+  gEfiSmbiosProtocolGuid  # PROTOCOL ALWAYS_CONSUMED
+
+[Depex]
+  gEfiSmbiosProtocolGuid
diff --git

[edk2-devel] [edk2-platform][PATCH v3] MinPlatformPkg: Add multiple segment support for PciHostBridgeLib

2019-05-17 Thread Marc W Chen

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

1. Add PcdPciSegmentCount PCD in MinPlatformPkg.dec and set default to 1
2. Base on PciHostBridge related PCDs to Initialize RootBridges.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marc Chen 
Cc: Michael Kubacki 
Cc: Sai Chaganty 
---
 Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec   |  3 +-
 .../PciHostBridgeLibSimple.c   | 83 ++
 .../PciHostBridgeLibSimple.inf |  4 +-
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec 
b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
index 3185776ac3..e1ae8004cb 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
@@ -6,7 +6,7 @@
 # INF files to generate AutoGen.c and AutoGen.h files
 # for the build infrastructure.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 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.
@@ -223,6 +223,7 @@ 
gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x9019
   gMinPlatformPkgTokenSpaceGuid.PcdPciDmaAbove4G   
|FALSE|BOOLEAN|0x4001004B
   gMinPlatformPkgTokenSpaceGuid.PcdPciNoExtendedConfigSpace
|FALSE|BOOLEAN|0x4001004C
   gMinPlatformPkgTokenSpaceGuid.PcdPciResourceAssigned 
|FALSE|BOOLEAN|0x4001004D
+  gMinPlatformPkgTokenSpaceGuid.PcdPciSegmentCount |0x1
|UINT8|0x4001004E
 
   
gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x1800|UINT16|0x00010035
   
gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x|UINT16|0x00010036
diff --git 
a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
 
b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
index 557ac2a5b3..25259e2f2d 100644
--- 
a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
+++ 
b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
@@ -1,7 +1,7 @@
 /** @file
-  SA PciHostBridge Library
+  PciHostBridge Library
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 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
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -28,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 
*mPciHostBridgeLibAcpiAddressSpaceTypeStr[] = {
   L"Mem", L"I/O", L"Bus"
 };
-ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
+ACPI_HID_DEVICE_PATH mRootBridgeDeviceNodeTemplate = {
   {
 ACPI_DEVICE_PATH,
 ACPI_DP,
@@ -41,7 +42,7 @@ ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
   0
 };
 
-PCI_ROOT_BRIDGE mRootBridge = {
+PCI_ROOT_BRIDGE mRootBridgeTemplate = {
   0,
   EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |
   EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO |
@@ -66,41 +67,67 @@ PCI_ROOT_BRIDGE mRootBridge = {
   NULL // DevicePath;
 };
 
+/**
+  Return all the root bridge instances.
+
+  @param Count  Return the count of root bridge instances.
+
+  @return All the root bridge instances, it will be NULL if system has 
insufficient memory
+  resources available and count will be zero.
+**/
+
 PCI_ROOT_BRIDGE *
 EFIAPI
 PciHostBridgeGetRootBridges (
   UINTN *Count
   )
 {
-  mRootBridge.Mem.Base = PcdGet32 (PcdPciReservedMemBase);
+  UINT8 Index;
+  PCI_ROOT_BRIDGE *RootBridge;
+
+  RootBridge = AllocateZeroPool (sizeof (PCI_ROOT_BRIDGE) * PcdGet8 
(PcdPciSegmentCount));
+  if (RootBridge == NULL) {
+DEBUG ((DEBUG_ERROR, "PciHostBridge: Out of resource\n"));
+*Count = 0;
+return RootBridge;
+  }
+
+  mRootBridgeTemplate.Mem.Base = PcdGet32 (PcdPciReservedMemBase);
   if (PcdGet32(PcdPciReservedMemLimit) != 0) {
-mRootBridge.Mem.Limit = PcdGet32 (PcdPciReservedMemLimit);
+mRootBridgeTemplate.Mem.Limit = PcdGet32 (PcdPciReservedMemLimit);
   } else {
-mRootBridge.Mem.Limit = (UINT32)PcdGet64 (PcdPciExpressBaseAddress);
+mRootBridgeTemplate.Mem.Limit = (UINT32) PcdGet64 
(PcdPciExpressBaseAddress);
   }
 
-  mRootBridge.MemAbove4G.Base = PcdGet64 (PcdPciReservedMemAbove4GBBase);
-  mRootBridge.MemAbove4G.Limit = PcdGet64 (PcdPciReservedMemAbove4GBLimit);
+  mRootBridgeTemplate.MemAbove4G.Base = PcdGet64 
(PcdPciReservedMemAbove4GBBase);
+

Re: [edk2-devel] [edk2-platform][PATCH v2] MinPlatformPkg: Add multiple segment support for PciHostBridgeLib

2019-05-17 Thread Kubacki, Michael A

Please make two quick updates in V3:

1. Add the Contributed-under tag (1.1 agreement) since these files have not 
moved to
the BSD+Patent license yet.
2. Please prefix the BZ link with "REF:" as shown here:
 https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format

> -Original Message-
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Marc W Chen
> Sent: Thursday, May 16, 2019 11:38 PM
> To: devel@edk2.groups.io
> Cc: Chen, Marc W ; Kubacki, Michael A
> ; Chaganty, Rangasai V
> 
> Subject: [edk2-devel] [edk2-platform][PATCH v2] MinPlatformPkg: Add
> multiple segment support for PciHostBridgeLib
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1799
> 
> 1. Add PcdPciSegmentCount PCD in MinPlatformPkg.dec and set default to 1
> 2. Base on PciHostBridge related PCDs to Initialize RootBridges.
> 
> Signed-off-by: Marc Chen 
> Cc: Michael Kubacki 
> Cc: Sai Chaganty 
> ---
>  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec   |  3 +-
>  .../PciHostBridgeLibSimple.c   | 83 
> ++
>  .../PciHostBridgeLibSimple.inf |  4 +-
>  3 files changed, 59 insertions(+), 31 deletions(-)
> 
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> index 3185776ac3..e1ae8004cb 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> @@ -6,7 +6,7 @@
>  # INF files to generate AutoGen.c and AutoGen.h files  # for the build
> infrastructure.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2017 - 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.
> @@ -223,6 +223,7 @@
> gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x9
> 019
>gMinPlatformPkgTokenSpaceGuid.PcdPciDmaAbove4G
> |FALSE|BOOLEAN|0x4001004B
>gMinPlatformPkgTokenSpaceGuid.PcdPciNoExtendedConfigSpace
> |FALSE|BOOLEAN|0x4001004C
>gMinPlatformPkgTokenSpaceGuid.PcdPciResourceAssigned
> |FALSE|BOOLEAN|0x4001004D
> +  gMinPlatformPkgTokenSpaceGuid.PcdPciSegmentCount |0x1
> |UINT8|0x4001004E
> 
> 
> gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x1800|
> UINT16|0x00010035
> 
> gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x|
> UINT16|0x00010036
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> index 557ac2a5b3..25259e2f2d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> +++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/P
> +++ ciHostBridgeLibSimple.c
> @@ -1,7 +1,7 @@
>  /** @file
> -  SA PciHostBridge Library
> +  PciHostBridge Library
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 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 @@ -15,6 +15,7 @@ WITHOUT
> WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include   #include  @@
> -28,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
> KIND, EITHER EXPRESS OR IMPLIED.
>  GLOBAL_REMOVE_IF_UNREFERENCED CHAR16
> *mPciHostBridgeLibAcpiAddressSpaceTypeStr[] = {
>L"Mem", L"I/O", L"Bus"
>  };
> -ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
> +ACPI_HID_DEVICE_PATH mRootBridgeDeviceNodeTemplate = {
>{
>  ACPI_DEVICE_PATH,
>  ACPI_DP,
> @@ -41,7 +42,7 @@ ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode = {
>0
>  };
> 
> -PCI_ROOT_BRIDGE mRootBridge = {
> +PCI_ROOT_BRIDGE mRootBridgeTemplate = {
>0,
>EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |
>EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO |
> @@ -66,41 +67,67 @@ PCI_ROOT_BRIDGE mRootBridge = {
>NULL // DevicePath;
>  };
> 
> +/**
> +  Return all the root bridge instances.
> +
> +  @param Count  Return the count of root bridge instances.
> +
> +  @return All the root bridge instances, it will be NULL if system has
> insufficient memory
> +  resources available and count will be zero.
> +**/
> +
>  PCI_ROOT_BRIDGE *
>  EFIAPI
>  PciHostBridgeGetRootBridges (
>UINTN *Count
>)
>  {
> -  mRootBridge.Mem.Base = PcdGet32 (PcdPciReservedMemBase);
> +  UINT8 Index;
> +  PCI_ROOT_BRIDGE *RootBridge;
> +
> +  RootBridge = AllocateZeroPool (sizeof (PCI_ROOT_BRIDGE) * PcdGet8
> + (PcdPciSegmentCount));  if (RootBridge ==

Re: [edk2-devel] [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-17 Thread Kubacki, Michael A

This looks like a good improvement.
---
* This is touching three packages though the patch only calls out 
PurleyOpenBoardPkg.
  * AdvancedFeaturePkg
  * MinPlatformPkg
  * Purley OpenBoardPkg
---
* Copyright years in files modified are not updated.
---
There's some PatchCheck.py errors, please check and fix those.

Thanks,
Michael

> -Original Message-
> From: Zhang, Shenglei
> Sent: Friday, May 17, 2019 12:10 AM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A ; Yao, Jiewen
> ; Lu, Shifei A ; Zhou, Bowen
> 
> Subject: [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg:
> Update DSC/FDF to use NetworkPkg's fragment file.
> 
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.And add network related definition in Purley
> PlatformPkg.dsc.
> 
> Cc: Michael A Kubacki 
> Cc: Jiewen Yao 
> cc: Shifei A Lu 
> cc: Xiaohu Zhou 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang 
> ---
>  .../Include/Dsc/CoreAdvancedDxeInclude.dsc| 26 +--
>  .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 26 +--
>  .../Include/Dsc/CoreCommonLib.dsc | 11 
>  .../BoardMtOlympus/PlatformPkg.dsc|  6 +
>  4 files changed, 14 insertions(+), 55 deletions(-)
> 
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> index 6764d46131..0c44c52582 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclu
> +++ de.dsc
> @@ -17,31 +17,7 @@
>#
># UEFI network modules
>#
> -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -
> -  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> -  NetworkPkg/TcpDxe/TcpDxe.inf
> -  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> -  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> -  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> -
> -  NetworkPkg/DnsDxe/DnsDxe.inf
> -  NetworkPkg/HttpDxe/HttpDxe.inf
> -  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> -  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> -
> -  NetworkPkg/IScsiDxe/IScsiDxe.inf
> -  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -!endif
> +  !include NetworkPkg/NetworkComponents.dsc.inc
> 
>  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
>MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> index 64f1dd5872..97706f7805 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateIncl
> +++ ude.fdf
> @@ -17,31 +17,7 @@
>  #
>  # UEFI network modules
>  #
> -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE -INF
> MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -
> -INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> -INF  NetworkPkg/TcpDxe/TcpDxe.inf
> -INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> -INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> -INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> -
> -INF  NetworkPkg/DnsDxe/DnsDxe.inf
> -INF  NetworkPkg/HttpDxe/HttpDxe.inf
> -INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> -INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> -
> -INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
> -INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -!endif
> +!include NetworkPkg/Network.fdf.inc
> 
>  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE  INF
> MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> index dd0173a1af..e8f4760395 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> +++

[edk2-devel] [PATCH edk2-platforms V2 05/16] Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Hisilicon/D06/D06.dsc | 42 --
 Platform/Hisilicon/D06/D06.fdf | 27 +-
 2 files changed, 11 insertions(+), 58 deletions(-)

diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 73bea728b0..e6cd975255 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -28,8 +28,14 @@
   BUILD_TARGETS  = DEBUG|NOOPT|RELEASE
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
-  DEFINE NETWORK_IP6_ENABLE  = FALSE
-  DEFINE HTTP_BOOT_ENABLE= FALSE
+
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_TLS_ENABLE  = FALSE
+  DEFINE NETWORK_VLAN_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
 
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
@@ -42,12 +48,8 @@
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
   
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
   
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
@@ -55,9 +57,8 @@
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
 
-!if $(HTTP_BOOT_ENABLE) == TRUE
+!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE
   HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
 !endif
 
@@ -346,30 +347,7 @@
   #
   #network
   #
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
+!include NetworkPkg/Network.dsc.inc
 
   MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index e402628a1b..fda896097a 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -245,32 +245,7 @@ READ_LOCK_STATUS   = TRUE
   #
   #Network
   #
-  INF Platform/Hisilicon/D06/Drivers/Net/SnpHi1620NewDxe/SnpDxe.inf
-
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
-  INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
-
+!include NetworkPkg/Network.fdf.inc
 
   #
   # PCI Support
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40875):

[edk2-devel] [PATCH edk2-platforms V2 11/16] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 .../Overdrive1000Board/Overdrive1000Board.dsc | 27 +++
 .../Overdrive1000Board/Overdrive1000Board.fdf | 16 +--
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc 
b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index cc4f2facd0..3dc805921c 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -29,6 +29,14 @@ DEFINE NUM_CORES= 4
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 

 #
 # Library Class section - list of all Library Classes needed by this Platform.
@@ -75,11 +83,6 @@ DEFINE NUM_CORES= 4
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
 
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -572,23 +575,11 @@ DEFINE NUM_CORES= 4
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+!include NetworkPkg/Network.dsc.inc
   MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf {
 
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21
   }
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# NetworkPkg/IScsiDxe/IScsiDxe.inf
 
   #
   # Core Info
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf 
b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
index fa814880e0..6d7cfb3933 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -185,21 +185,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
   #
   # Core Info
   #
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40881): https://edk2.groups.io/g/devel/message/40881
Mute This Topic: https://groups.io/mt/31652751/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf 
b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index b163dab5c3..93ea18ba18 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -189,17 +189,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.fdf.inc
 
 !ifdef EDK2_ENABLE_SMSC_91X
   INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40883): https://edk2.groups.io/g/devel/message/40883
Mute This Topic: https://groups.io/mt/31652753/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 15/16] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Cc: Zailiang Sun 
Cc: Yi Qian 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf   | 24 +--
 .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc   |  6 +++
 .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf  | 24 +--
 .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc   | 43 +++
 .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 +++--
 .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc  | 42 +++---
 6 files changed, 28 insertions(+), 150 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 098602b9d8..5827386977 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -714,33 +714,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 #
 # Network Modules
 #
+!include NetworkPkg/Network.fdf.inc
+
 !if $(NETWORK_ENABLE) == TRUE
   FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
 SECTION PE32 = 
Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
 SECTION UI = "UNDI"
   }
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF  NetworkPkg/TcpDxe/TcpDxe.inf
-  !if $(NETWORK_IP6_ENABLE) == TRUE
-  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  !endif
-  !if $(NETWORK_VLAN_ENABLE) == TRUE
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  !endif
-  !if $(NETWORK_ISCSI_ENABLE) == TRUE
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  !endif
 !endif
 
 !if $(CAPSULE_ENABLE)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index 6d556c1be2..61eca30be1 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -76,10 +76,16 @@ DEFINE ENBDT_S3_SUPPORT = TRUE
 
 DEFINE LZMA_ENABLE = TRUE
 DEFINE S4_ENABLE = TRUE
+
+#
+# Network definition
+#
 DEFINE NETWORK_ENABLE = TRUE
 DEFINE NETWORK_IP6_ENABLE = TRUE
 DEFINE NETWORK_ISCSI_ENABLE = FALSE
 DEFINE NETWORK_VLAN_ENABLE = FALSE
+DEFINE NETWORK_TLS_ENABLE = FALSE
+DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
 
 DEFINE SATA_ENABLE   = TRUE
 DEFINE PCIESC_ENABLE = TRUE
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 1ba6124a69..a6859d3b6d 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -670,33 +670,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 #
 # Network Modules
 #
+!include NetworkPkg/Network.fdf.inc
+
 !if $(NETWORK_ENABLE) == TRUE
   FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
 SECTION PE32 = 
Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
 SECTION UI = "UNDI"
   }
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF  NetworkPkg/TcpDxe/TcpDxe.inf
-  !if $(NETWORK_IP6_ENABLE) == TRUE
-  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  !endif
-  !if $(NETWORK_VLAN_ENABLE) == TRUE
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  !endif
-  !if $(NETWORK_ISCSI_ENABLE) == TRUE
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  !endif
 !endif
 
 !if $(CAPSULE_ENABLE)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc 
b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index b9faf558b7..cea50d486c 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -50,6 +50,8 @@
   !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt
   !include

[edk2-devel] [PATCH edk2-platforms V2 03/16] Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Hisilicon/D03/D03.dsc | 26 +++---
 Platform/Hisilicon/D03/D03.fdf | 10 +-
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index 07ff461277..d98997c59e 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -29,6 +29,16 @@
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+  DEFINE NETWORK_VLAN_ENABLE= FALSE
+
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
 [LibraryClasses.common]
@@ -40,13 +50,8 @@
 
   IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
 
 
 !ifdef $(FDT_ENABLE)
@@ -404,16 +409,7 @@
 
   Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
 
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.dsc.inc
   Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf
 
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index 3f07b2e577..fc8a2945ea 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -246,15 +246,7 @@ READ_LOCK_STATUS   = TRUE
   INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
   INF Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf
 
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
+!include NetworkPkg/Network.fdf.inc
 
 !ifdef $(FDT_ENABLE)
   INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40873): https://edk2.groups.io/g/devel/message/40873
Mute This Topic: https://groups.io/mt/31652743/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 .../Socionext/DeveloperBox/DeveloperBox.dsc   | 29 +--
 .../Socionext/DeveloperBox/DeveloperBox.fdf   | 24 ++-
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc 
b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 909cfb5507..24f221a022 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -28,6 +28,11 @@
   FLASH_DEFINITION   = 
Platform/Socionext/DeveloperBox/DeveloperBox.fdf
   BUILD_NUMBER   = 1
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_TLS_ENABLE  = FALSE
+
   DEFINE DEBUG_ON_UART1  = FALSE
   DEFINE SECURE_BOOT_ENABLE  = FALSE
   DEFINE X64EMU_ENABLE   = FALSE
@@ -410,28 +415,8 @@
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  NetworkPkg/TlsDxe/TlsDxe.inf
-  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.dsc.inc
+
   Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
 
   DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf 
b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index 5309a77c1a..10c5307ebf 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -215,28 +215,8 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  INF NetworkPkg/TlsDxe/TlsDxe.inf
-  INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.fdf.inc
+
   INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
 
   #
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40879): https://edk2.groups.io/g/devel/message/40879
Mute This Topic: https://groups.io/mt/31652749/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 07/16] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Hisilicon/HiKey960/HiKey960.dsc | 25 ++--
 Platform/Hisilicon/HiKey960/HiKey960.fdf | 11 +--
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc 
b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index a4a1a371de..f127159138 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -28,6 +28,15 @@
 
   DEFINE CONFIG_NO_DEBUGLIB  = TRUE
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+  DEFINE NETWORK_VLAN_ENABLE= FALSE
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
 [LibraryClasses.common]
@@ -54,11 +63,6 @@
 
   # Network Libraries
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
   # VariableRuntimeDxe Requirements
   
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
@@ -229,16 +233,7 @@
   #
   # UEFI Network Stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.dsc.inc
   #
   # FAT filesystem + GPT/MBR partitioning
   #
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf 
b/Platform/Hisilicon/HiKey960/HiKey960.fdf
index 1b07284dc8..def66d41d4 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
+++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
@@ -153,16 +153,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # UEFI Network Stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
   #
   # FAT filesystem + GPT/MBR partitioning
   #
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40877): https://edk2.groups.io/g/devel/message/40877
Mute This Topic: https://groups.io/mt/31652747/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

v2: Remove TcpIoLib and HttpLib.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 .../AMD/OverdriveBoard/OverdriveBoard.dsc | 31 +--
 .../AMD/OverdriveBoard/OverdriveBoard.fdf | 23 +-
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc 
b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 39b5dad154..9a70c62251 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -78,12 +78,6 @@ DEFINE X64EMU_ENABLE  = FALSE
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -130,9 +124,7 @@ DEFINE X64EMU_ENABLE  = FALSE
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
   
PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
 
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
 
   
UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -641,28 +633,7 @@ DEFINE X64EMU_ENABLE  = FALSE
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  NetworkPkg/TlsDxe/TlsDxe.inf
-  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.dsc.inc
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 
   #
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf 
b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index 2aaf83084e..49af46cd16 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -193,28 +193,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-  INF NetworkPkg/TlsDxe/TlsDxe.inf
-  INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.fdf.inc
   INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 
   #
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40871): https://edk2.groups.io/g/devel/message/40871
Mute This Topic: https://groups.io/mt/31652741/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.And add network related definition in
Purley PlatformPkg.dsc.

Cc: Michael A Kubacki 
Cc: Jiewen Yao 
cc: Shifei A Lu 
cc: Xiaohu Zhou 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 .../Include/Dsc/CoreAdvancedDxeInclude.dsc| 26 +--
 .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 26 +--
 .../Include/Dsc/CoreCommonLib.dsc | 11 
 .../BoardMtOlympus/PlatformPkg.dsc|  6 +
 4 files changed, 14 insertions(+), 55 deletions(-)

diff --git 
a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc 
b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
index 6764d46131..0c44c52582 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
@@ -17,31 +17,7 @@
   #
   # UEFI network modules
   #
-!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-!endif
+  !include NetworkPkg/NetworkComponents.dsc.inc
 
 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
   MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
diff --git 
a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf 
b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
index 64f1dd5872..97706f7805 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
@@ -17,31 +17,7 @@
 #
 # UEFI network modules
 #
-!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
-INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-
-INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-INF  NetworkPkg/TcpDxe/TcpDxe.inf
-INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-
-INF  NetworkPkg/DnsDxe/DnsDxe.inf
-INF  NetworkPkg/HttpDxe/HttpDxe.inf
-INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
-INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-!endif
+!include NetworkPkg/Network.fdf.inc
 
 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc 
b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index dd0173a1af..e8f4760395 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -78,11 +78,12 @@
   #
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+
+  #
+  # Network libraries
+  #
+!include NetworkPkg/NetworkLibs.dsc.inc
+
   
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
 
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc 
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index ded1201a86..c549936299 100644
---

[edk2-devel] [PATCH edk2-platforms V2 10/16] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

v2: Change Network.dsc.inc to Network.fdf.inc in SynQuacerEvalBoard.fdf.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +--
 .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++-
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc 
b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 8dbf836f7e..9961c91141 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -28,6 +28,12 @@
   FLASH_DEFINITION   = 
Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
   BUILD_NUMBER   = 1
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+
 [BuildOptions]
   RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 
@@ -55,11 +61,6 @@
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
 
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -119,9 +120,6 @@
   
SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
   PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
 
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
@@ -600,25 +598,8 @@
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+!include NetworkPkg/Network.dsc.inc
+
   Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
 
   DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf 
b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index 1e07f579a8..4c25194102 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -192,25 +192,8 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-  INF NetworkPkg/DnsDxe/DnsDxe.inf
-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  INF NetworkPkg/HttpDxe/HttpDxe.inf
-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+!include NetworkPkg/Network.fdf.inc
+
   INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
 
   #
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40880): https://edk2.groups.io/g/devel/message/40880
Mute This Topic: https://groups.io/mt/31652750/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

v2: Withdraw the unnecessary changes.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 .../ArmVExpress-networking.fdf.inc| 12 +
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  | 26 +++
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc 
b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
index b647f65ad1..887b8dd72d 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
@@ -14,17 +14,7 @@
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+!include NetworkPkg/Network.fdf.inc
 
 !if $(INCLUDE_TFTP_COMMAND) == TRUE
   #
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc 
b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index e7a77c0ad9..7e10f62ca1 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -15,6 +15,14 @@
   SECURE_BOOT_ENABLE= FALSE
   INCLUDE_TFTP_COMMAND  = TRUE
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+
 
[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
 
@@ -60,12 +68,6 @@
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
 
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -415,17 +417,7 @@
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.dsc.inc
 !ifdef EDK2_ENABLE_SMSC_91X
   # SMSC LAN 91C111
   EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40872): https://edk2.groups.io/g/devel/message/40872
Mute This Topic: https://groups.io/mt/31652742/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 14/16] Platform/RDKQemu: Update DSC to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Comcast/RDKQemu/RDKQemu.dsc | 34 
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc 
b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index f22f14aed9..b63fc77587 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -34,7 +34,14 @@
   # -D FLAG=VALUE
   #
   DEFINE SECURE_BOOT_ENABLE  = TRUE
-  DEFINE HTTP_BOOT_ENABLE= TRUE
+
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = TRUE
 
 !include ArmVirtPkg/ArmVirt.dsc.inc
 
@@ -345,29 +352,8 @@
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
+!include NetworkPkg/Network.dsc.inc
+
   #
   # SCSI Bus and Disk Driver
   #
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40884): https://edk2.groups.io/g/devel/message/40884
Mute This Topic: https://groups.io/mt/31652754/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 06/16] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/Hisilicon/HiKey/HiKey.dsc | 26 ++
 Platform/Hisilicon/HiKey/HiKey.fdf | 10 +-
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc 
b/Platform/Hisilicon/HiKey/HiKey.dsc
index 7e05babb6c..2081e95b06 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -28,6 +28,15 @@
 
   DEFINE CONFIG_NO_DEBUGLIB  = TRUE
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+  DEFINE NETWORK_VLAN_ENABLE= FALSE
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
 [LibraryClasses.common]
@@ -53,12 +62,6 @@
   # USB Requirements
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
 
-  # Network Libraries
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
   # VariableRuntimeDxe Requirements
   
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
@@ -245,16 +248,7 @@
   #
   # UEFI Network Stack
   #
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.dsc.inc
   #
   # AX88772 Ethernet Driver
   #
diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf 
b/Platform/Hisilicon/HiKey/HiKey.fdf
index 7e6c8083bb..aadbfc0075 100644
--- a/Platform/Hisilicon/HiKey/HiKey.fdf
+++ b/Platform/Hisilicon/HiKey/HiKey.fdf
@@ -159,15 +159,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # UEFI Network Stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
+!include NetworkPkg/Network.fdf.inc
 
   #
   # AX88772 Ethernet Driver for Apple Ethernet Adapter
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40876): https://edk2.groups.io/g/devel/message/40876
Mute This Topic: https://groups.io/mt/31652746/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc,
   Armada80x0Db.dsc and Armada80x0McBin.dsc.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc |  8 
 Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc |  8 
 .../Armada80x0McBin/Armada80x0McBin.dsc|  8 
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc  | 18 +-
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf  | 12 +---
 5 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc 
b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 01532b4a00..8ee84902ef 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -46,6 +46,14 @@
   FLASH_DEFINITION   = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
   BOARD_DXE_FV_COMPONENTS= 
Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
 [LibraryClasses.common]
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc 
b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
index c6510d..5418ddcaa7 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
@@ -46,6 +46,14 @@
   FLASH_DEFINITION   = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
   BOARD_DXE_FV_COMPONENTS= 
Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
 [LibraryClasses.common]
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc 
b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
index d08013612f..ff9bd5dc8c 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
@@ -47,6 +47,14 @@
   BOARD_DXE_FV_COMPONENTS= 
Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
   CAPSULE_ENABLE = TRUE
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE   = FALSE
+
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
 [LibraryClasses.common]
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc 
b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 0cf5d8447a..cfbc172b4f 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -115,12 +115,6 @@
   
RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
   
ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
 
-  # Network support
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
   # These libraries are used by the dynamic EFI Shell commands
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
@@ -471,17 +465,7 @@
   Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
 
   # Network support
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
+!include NetworkPkg/Network.dsc.inc
   Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
   Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
   Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf 
b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index 8a050ef987..01a5ea3bed 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -135,17 +135,7 @@ FvNameGuid

[edk2-devel] [PATCH edk2-platforms V2 08/16] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
Reviewed-by: Leif Lindholm 
---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc | 28 +++---
 Platform/LeMaker/CelloBoard/CelloBoard.fdf | 15 +---
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc 
b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index bc2f3e2076..85ef45093a 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -29,6 +29,13 @@ DEFINE NUM_CORES= 4
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = Platform/LeMaker/CelloBoard/CelloBoard.fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
+
 

 #
 # Library Class section - list of all Library Classes needed by this Platform.
@@ -75,13 +82,6 @@ DEFINE NUM_CORES= 4
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
   # ARM Architectural Libraries
   
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -580,19 +580,7 @@ DEFINE NUM_CORES= 4
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.dsc.inc
 
   #
   # Core Info
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf 
b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
index d34b986b93..eae0019a1b 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
@@ -178,20 +178,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
   #
   # Core Info
   #
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40878): https://edk2.groups.io/g/devel/message/40878
Mute This Topic: https://groups.io/mt/31652748/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms V2 04/16] Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment file.

2019-05-17 Thread Zhang, Shenglei

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

v2: Withdraw unrelated changes.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 Platform/Hisilicon/D05/D05.dsc | 59 ++
 Platform/Hisilicon/D05/D05.fdf | 23 +
 2 files changed, 18 insertions(+), 64 deletions(-)

diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index 70b044c7e3..740bc2af64 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -29,8 +29,15 @@
   SKUID_IDENTIFIER   = DEFAULT
   FLASH_DEFINITION   = 
Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
   DEFINE EDK2_SKIP_PEICORE=0
-  DEFINE NETWORK_IP6_ENABLE  = FALSE
-  DEFINE HTTP_BOOT_ENABLE= FALSE
+
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_SNP_ENABLE = FALSE
+  DEFINE NETWORK_TLS_ENABLE = FALSE
+  DEFINE NETWORK_VLAN_ENABLE= FALSE
+  DEFINE NETWORK_IP6_ENABLE = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE   = FALSE
 
 !include Silicon/Hisilicon/Hisilicon.dsc.inc
 
@@ -43,12 +50,8 @@
 
   IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
   
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
   
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
@@ -56,11 +59,6 @@
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-!endif
 
 !ifdef $(FDT_ENABLE)
   #FDTUpdateLib
@@ -95,10 +93,10 @@
 
   LpcLib|Silicon/Hisilicon/Hi1610/Library/LpcLib/LpcLib.inf
   
SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
-  
PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
+  
PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
   
PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
   
PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
-  
PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
+  
PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
 
 [LibraryClasses.common.SEC]
   
ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
@@ -136,7 +134,7 @@
 
 [PcdsFixedAtBuild.common]
   gArmPlatformTokenSpaceGuid.PcdCoreCount|8
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0
+  gArmTokenSpaceGuid.PcdPciIoTranslation|0
 
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
 
@@ -472,7 +470,7 @@
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 
-  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
+  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
   Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
 
   Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf
@@ -538,30 +536,7 @@
 
   Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
 
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-!if $(NETWORK_IP6_ENABLE) == TRUE
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-!endif
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-!endif
-
-
+!include NetworkPkg/Network.dsc.inc
   Platform/Hisilicon/D05/Drivers/Sas/SasDxeDriver.inf
 
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
@@ -608,10 +583,10 @@
 
   NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
   }
-

[edk2-devel] [PATCH edk2-platforms V2 00/16] Add Network's include segment files in DSC/FDF

2019-05-17 Thread Zhang, Shenglei

We have plan to move all network related modules/libraries to
NetworkPkg. So in order to make these changes happen smoothly,
We update platforms' DSC/FDF to use Network's include segment files.

v2:1.Add Contributed-under tag in all patches,based on current edk2/master.
   2.Modify changes in part of patch series.

Shenglei Zhang (16):
  Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment
file.
  Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include
fragment file.
  Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment
file.
  Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment
file.
  Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment
file.
  Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment
file.
  Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include
fragment file.
  Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include
fragment file.
  Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's fragment
file.
  Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's
fragment file.
  Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's
fragment file.
  Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include
fragment file.
  Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
  Platform/RDKQemu: Update DSC to use NetworkPkg's include fragment
file.
  Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's
fragment file.
  Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's
fragment file.

 .../AMD/OverdriveBoard/OverdriveBoard.dsc | 31 +-
 .../AMD/OverdriveBoard/OverdriveBoard.fdf | 23 +---
 Platform/ARM/SgiPkg/SgiPlatform.fdf   | 12 +---
 .../ArmVExpress-networking.fdf.inc| 12 +---
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  | 26 +++-
 Platform/Comcast/RDKQemu/RDKQemu.dsc  | 34 ---
 Platform/Hisilicon/D03/D03.dsc| 26 
 Platform/Hisilicon/D03/D03.fdf| 10 +---
 Platform/Hisilicon/D05/D05.dsc| 59 ++-
 Platform/Hisilicon/D05/D05.fdf| 23 +---
 Platform/Hisilicon/D06/D06.dsc| 42 -
 Platform/Hisilicon/D06/D06.fdf| 27 +
 Platform/Hisilicon/HiKey/HiKey.dsc| 26 
 Platform/Hisilicon/HiKey/HiKey.fdf| 10 +---
 Platform/Hisilicon/HiKey960/HiKey960.dsc  | 25 
 Platform/Hisilicon/HiKey960/HiKey960.fdf  | 11 +---
 .../Include/Dsc/CoreAdvancedDxeInclude.dsc| 26 +---
 .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 26 +---
 .../Include/Dsc/CoreCommonLib.dsc | 11 ++--
 .../BoardMtOlympus/PlatformPkg.dsc|  6 ++
 .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf   | 24 +---
 .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc   |  6 ++
 .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf  | 24 +---
 .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc   | 43 +++---
 .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 ++--
 .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc  | 42 ++---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc| 28 +++--
 Platform/LeMaker/CelloBoard/CelloBoard.fdf| 15 +
 .../Marvell/Armada70x0Db/Armada70x0Db.dsc |  8 +++
 .../Marvell/Armada80x0Db/Armada80x0Db.dsc |  8 +++
 .../Socionext/DeveloperBox/DeveloperBox.dsc   | 29 +++--
 .../Socionext/DeveloperBox/DeveloperBox.fdf   | 24 +---
 .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +++
 .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 +--
 .../Overdrive1000Board/Overdrive1000Board.dsc | 27 +++--
 .../Overdrive1000Board/Overdrive1000Board.fdf | 16 +
 .../Armada80x0McBin/Armada80x0McBin.dsc   |  8 +++
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +-
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +---
 39 files changed, 192 insertions(+), 701 deletions(-)

-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40870): https://edk2.groups.io/g/devel/message/40870
Mute This Topic: https://groups.io/mt/31652729/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with BSD+Patent License

2019-05-17 Thread Kubacki, Michael A

Reviewed-by: Michael Kubacki 

> -Original Message-
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel ; Kubacki, Michael A
> 
> Subject: [[edk2-platforms][PATCH V2] 10/30]
> Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with
> BSD+Patent License
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> Replace BSD 2-Clause License with BSD+Patent License.  This change is
> based on the following emails:
> 
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> 
> RFCs with detailed process for the license change:
> 
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
> 
> Cc: Chasel Chiu 
> Cc: Michael Kubacki 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney 
> ---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +---
>  .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf| 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL   | 8 +---
>  .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl   | 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL  | 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl   | 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl  | 8 +---
>  .../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL| 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl  | 8 +---
>  .../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL| 8 +---
>  .../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl| 8 +---
>  .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl   | 8 +---
>  .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl   | 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +---
>  .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c   | 8 +---
>  .../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c | 8 +---
>  .../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h | 8 +---
>  .../Features/PciHotPlug/PciHotPlug.inf| 8 +---
>  .../Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl| 8 +---
>  .../KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl  | 8 +---
>  .../Features/Tbt/Include/Acpi/TbtNvs.asl  | 8 +---
>  .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +---
>  .../Features/Tbt/Include/Library/DxeTbtPolicyLib.h| 8 +---
>  .../Features/Tbt/Include/Library/PeiTbtPolicyLib.h| 8 +---
>  .../Features/Tbt/Include/Library/TbtCommonLib.h   | 8 +---
>  .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h   | 8 +---
>  .../Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h | 8 +---
>  .../Tbt/Include/Private/Library/PeiTbtCommonInitLib.h | 8 +---
>  .../Features/Tbt/Include/Protocol/DxeTbtPolicy.h  | 8 +---
>  .../Features/Tbt/Include/Protocol/TbtNvsArea.h| 8 +---
>  .../Features/Tbt/Include/TbtBoardInfo.h   | 8 +---
>  .../Features/Tbt/Include/TbtPolicyCommonDefinition.h  | 8 +---
>  .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +---
>  .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf   | 8 +---
>  .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +---
>  .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c  | 8 +---
>  .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf| 8 +---
>  .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +---
>  .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf   | 8 +---
>  .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +---
>  .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c   | 8 +---
>  .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +---
>  .../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +---
>  .../Features/Tbt/TbtInit/Dxe/TbtDxe.inf   | 8 +---
>  .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +---
>  .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf   | 8 +---
>  .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c  | 8 +---
>  .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h  | 8 +---
>  .../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +---
>  .../Features/Tbt/TbtInit/Smm/TbtSmm.inf   | 8 +---
>  .../PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c| 8 +---
>

1 2 >

1 - 100 of 107 matches

Mail list logo