[edk2-platforms][PATCH v1 00/16] Drop IntelFramework[Module]Pkg dependency

[edk2-platforms][PATCH v1 00/16] Drop IntelFramework[Module]Pkg dependency

[Wu, Hao A]

This series will drop the IntelFramework[Module]Pkg dependency for
platforms within the edk2-platforms repo. This is the 1st part series,
which will handle platforms only with explicit dependency on the framework
packages.

The affected platforms include:
* Platform/AMD/OverdriveBoard
* Platform/BeagleBoard
* Platform/Hisilicon/D0x
* Platform/LeMaker/CelloBoard
* Platform/SoftIron/Overdrive1000Board

Tests done:
Build verified for the above affected platforms.

Please note that for:
* Platform/Intel/QuarkPlatformPkg
* Vlv2TbltDevicePkg

They will handle by some one else with another patch sereis.

And for:
* Platform/RaspberryPi/RPi3

It has implicit dependency on the framework packages, and will be handled
in the part 2 series.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Hao A Wu (16):
  Platform/AMD: Use Lzma decompress lib in MdeModulePkg
  Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg
  Platform/BeagleBoard: Drop the consume of PcdShellFile
  Hisilicon/D0x: Use Lzma decompress lib in MdeModulePkg
  Hisilicon/D0x: Drop the consume of GenericBdsLib & PlatformBdsLib
  Hisilicon/D0x: Use StatusCode Router & Handler in MdeModulePkg
  Hisilicon/D06: Drop the consume of PcdShellFile
  Silicon/Hisilicon: Use Lzma decompress lib in MdeModulePkg
  Silicon/Hisilicon: Use ReportStatusCodeLib (DXE) in MdeModulePkg
  Silicon/Hisilicon: Use DebugLib (DXE_RUNTIME_DRIVER) in MdeModulePkg
  Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency
  Silicon/Hisilicon/PlatformIntelBdsLib: Remove Hisilicon PlatformBdsLib
  Platform/LeMaker: Use Lzma decompress lib in MdeModulePkg
  Platform/LeMaker: Use ReportStatusCodeLib in MdeModulePkg
  Platform/SoftIron: Use Lzma decompress lib in MdeModulePkg
  Platform/SoftIron: Use ReportStatusCodeLib in MdeModulePkg

 Silicon/Hisilicon/Hisilicon.dsc.inc                                                       |  10 +-
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc                                            |   2 +-
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc                                    |  13 +-
 Platform/Hisilicon/D03/D03.dsc                                                            |  10 +-
 Platform/Hisilicon/D05/D05.dsc                                                            |  10 +-
 Platform/Hisilicon/D06/D06.dsc                                                            |   8 +-
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                                                |  10 +-
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc                               |  10 +-
 Platform/Hisilicon/D03/D03.fdf                                                            |   6 +-
 Platform/Hisilicon/D05/D05.fdf                                                            |   6 +-
 Platform/Hisilicon/D06/D06.fdf                                                            |   6 +-
 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/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf                     |  84 --
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h                               |   1 -
 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h                          |  61 --
 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h                    |  27 -
 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 +-
 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c                          | 963 --------------------
 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c                    | 118 ---
 26 files changed, 57 insertions(+), 1315 deletions(-)
 delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
 delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
 delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
 delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
 delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c

-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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 {
     <LibraryClasses>
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   }
 
   #
-- 
2.12.0.windows.1

[PATCH 1/2] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

[PATCH 2/2] Platform/BeagleBoard: Drop the consume of PcdShellFile

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

[edk2-platforms][PATCH v1 03/16] Platform/BeagleBoard: Drop the consume of PcdShellFile

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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 {
     <LibraryClasses>
-      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 {
     <LibraryClasses>
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   }
 
   #
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

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

[Wu, Hao A]

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.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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
+  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
   #
   #ACPI
   #
diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index c1cd13b6c7..0c12181a38 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -255,7 +255,8 @@
   ArmPlatformPkg/PlatformPei/PlatformPeim.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
 
@@ -317,7 +318,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/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index 3f07b2e577..f7024f400d 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -199,7 +199,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
 
   #
   # Usb Support
@@ -329,7 +330,8 @@ READ_LOCK_STATUS   = TRUE
   INF Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf
   INF ArmPkg/Drivers/CpuPei/CpuPei.inf
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
+  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
   INF Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
 
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index 9632aea4b0..76c04b2740 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -203,7 +203,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
 
   #
   # Usb Support
@@ -351,7 +352,8 @@ READ_LOCK_STATUS   = TRUE
   INF Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf
   INF ArmPkg/Drivers/CpuPei/CpuPei.inf
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
+  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
   INF Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
 
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index e402628a1b..fb26881300 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -204,7 +204,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
 
   #
   # Usb Support
@@ -345,7 +346,8 @@ READ_LOCK_STATUS   = TRUE
   INF Platform/Hisilicon/D06/MemoryInitPei/MemoryInitPeim.inf
   INF ArmPkg/Drivers/CpuPei/CpuPei.inf
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
+  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
   INF Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
 
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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|0x94010000
   gHisiTokenSpaceGuid.PcdMailBoxAddress|0x0000FFF8
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

[edk2-platforms][PATCH v1 09/16] Silicon/Hisilicon: Use ReportStatusCodeLib (DXE) in MdeModulePkg

[Wu, Hao A]

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

This commit will update the DSC.INC 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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 Silicon/Hisilicon/Hisilicon.dsc.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index 72ba540a75..ea12b8da0b 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -170,13 +170,13 @@
   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
   PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
 
 [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
@@ -193,7 +193,7 @@
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.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
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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 <FrameworkDxe.h>
 #include <Protocol/Smbios.h>
 #include <IndustryStandard/SmBios.h>
 #include <Library/HiiLib.h>
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 <FrameworkDxe.h>
-
 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         = NULL;
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
index 9a42f04085..6c15a804c2 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
@@ -128,8 +128,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
     CHAR16                *ReleaseDate;
     CHAR16                *Char16String;
     EFI_STATUS            Status;
-    STRING_REF            TokenToUpdate;
-    STRING_REF            TokenToGet;
+    EFI_STRING_ID         TokenToUpdate;
+    EFI_STRING_ID         TokenToGet;
     SMBIOS_TABLE_TYPE0    *SmbiosRecord;
     EFI_SMBIOS_HANDLE     SmbiosHandle;
     SMBIOS_TABLE_TYPE0    *InputData;
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
index 5e965c996c..8baf0bbc67 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
@@ -52,12 +52,12 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer)
     EFI_STRING                      SerialNumber;
     EFI_STRING                      SKUNumber;
     EFI_STRING                      Family;
-    STRING_REF                      TokenToGet;
+    EFI_STRING_ID                   TokenToGet;
     EFI_SMBIOS_HANDLE               SmbiosHandle;
     SMBIOS_TABLE_TYPE1              *SmbiosRecord;
     SMBIOS_TABLE_TYPE1              *InputData;
     EFI_STATUS                      Status;
-    STRING_REF                      TokenToUpdate;
+    EFI_STRING_ID                   TokenToUpdate;
     CHAR16                          *Product;
     CHAR16                          *pVersion;
 
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
index a141f9e7d7..cef6887d3f 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
@@ -54,13 +54,13 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
     EFI_STRING                        SerialNumber;
     EFI_STRING                        AssetTag;
     EFI_STRING                        ChassisLocation;
-    STRING_REF                        TokenToGet;
+    EFI_STRING_ID                     TokenToGet;
     EFI_SMBIOS_HANDLE                 SmbiosHandle;
     SMBIOS_TABLE_TYPE2                *SmbiosRecord;
     SMBIOS_TABLE_TYPE2                *InputData = NULL;
     EFI_STATUS                        Status;
 
-    STRING_REF                        TokenToUpdate;
+    EFI_STRING_ID                     TokenToUpdate;
     //CHAR16                            *ProductName;
     //CHAR16                            *pVersion;
     //uniBIOS_y00216284_018_end 2015-1-13 09:08:22
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
index 4bb170117d..6f6f354b91 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
@@ -67,7 +67,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer)
     EFI_STRING                      SerialNumber;
     EFI_STRING                      AssertTag;
     EFI_STRING                      ChassisSkuNumber;
-    STRING_REF                      TokenToGet;
+    EFI_STRING_ID                   TokenToGet;
     EFI_SMBIOS_HANDLE               SmbiosHandle;
     SMBIOS_TABLE_TYPE3              *SmbiosRecord;
     SMBIOS_TABLE_TYPE3              *InputData;
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
index 945fd4c6e3..0fa4903460 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
@@ -29,7 +29,7 @@ UpdateSlotDesignation (
   IN SMBIOS_TABLE_TYPE9 *InputData
   )
 {
-    STRING_REF                      TokenToUpdate;
+    EFI_STRING_ID                   TokenToUpdate;
     CHAR16                          *SlotDesignation;
     UINTN                           DesignationStrLen;
 
@@ -140,7 +140,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignation)
     UINTN                              SlotDesignationStrLen;
     EFI_STATUS                         Status;
     EFI_STRING                         SlotDesignation;
-    STRING_REF                         TokenToGet;
+    EFI_STRING_ID                      TokenToGet;
     SMBIOS_TABLE_TYPE9                 *SmbiosRecord;
     EFI_SMBIOS_HANDLE                  SmbiosHandle;
     SMBIOS_TABLE_TYPE9                 *InputData = NULL;
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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..0000000000
--- 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.<BR>
-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
-#  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..0000000000
--- 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.<BR>
-  Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
-  Copyright (c) 2015, Linaro Limited. All rights reserved.<BR>
-
-  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/
-
-**/
-
-#ifndef _INTEL_BDS_PLATFORM_H_
-#define _INTEL_BDS_PLATFORM_H_
-
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-
-#include "IntelBdsPlatformCommon.h"
-
-VOID
-PlatformBdsEnterFrontPage (
-  IN UINT16                 TimeoutDefault,
-  IN BOOLEAN                ConnectAllHappened
-  );
-
-/**
-  Download the kernel, the initial ramdisk, and the kernel command line from
-  QEMU's fw_cfg. Construct a minimal SimpleFileSystem that contains the two
-  image files, and load and start the kernel from it.
-
-  The kernel will be instructed via its command line to load the initrd from
-  the same Simple FileSystem.
-
-  @retval EFI_NOT_FOUND         Kernel image was not found.
-  @retval EFI_OUT_OF_RESOURCES  Memory allocation failed.
-  @retval EFI_PROTOCOL_ERROR    Unterminated kernel command line.
-
-  @return                       Error codes from any of the underlying
-                                functions. On success, the function doesn't
-                                return.
-**/
-EFI_STATUS
-EFIAPI
-TryRunningQemuKernel (
-  VOID
-  );
-
-#endif // _INTEL_BDS_PLATFORM_H
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
deleted file mode 100644
index 73b901ab51..0000000000
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
-*
-*  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.
-*
-**/
-
-#ifndef _HW_BDS_LIB_H_
-#define _HW_BDS_LIB_H_
-
-EFI_STATUS
-EFIAPI
-HwBdsLibRegisterAppBootOption (
-  IN OUT LIST_ENTRY              *BdsBootOptionList,
-  IN GUID                        *FileGuid,
-  IN CHAR16                      *Description
-  );
-
-#endif
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
deleted file mode 100644
index dc23e46c1f..0000000000
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
+++ /dev/null
@@ -1,963 +0,0 @@
-/** @file
-  Implementation for PlatformBdsLib library class interfaces.
-
-  Copyright (C) 2015, Red Hat, Inc.
-  Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
-  Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
-  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/
-
-**/
-
-#include <IndustryStandard/Pci22.h>
-#include <Library/DevicePathLib.h>
-#include <Library/GenericBdsLib.h>
-#include <Library/IpmiCmdLib.h>
-#include <Library/PcdLib.h>
-#include <Library/PlatformBdsLib.h>
-#include <Library/PrintLib.h>
-#include <Library/UefiLib.h>
-#include <Protocol/DevicePath.h>
-#include <Protocol/DevicePathToText.h>
-#include <Protocol/GraphicsOutput.h>
-#include <Protocol/PciIo.h>
-#include <Protocol/PciRootBridgeIo.h>
-#include <Guid/GlobalVariable.h>
-
-#include "IntelBdsPlatform.h"
-
-GUID gOemBootVaraibleGuid = {0xb7784577, 0x5aaf, 0x4557, {0xa1, 0x99,
-  0xd4, 0xa4, 0x2f, 0x45, 0x06, 0xf8} };
-
-//3CEF354A-3B7A-4519-AD70-72A134698311
-GUID gEblFileGuid = {0x3CEF354A, 0x3B7A, 0x4519, {0xAD, 0x70,
-  0x72, 0xA1, 0x34, 0x69, 0x83, 0x11} };
-
-// Need to keep the same with FlashStartOs.inf
-// 282cae50-940e-11e5-b7b8-774201c0f2d8
-GUID gFlashStartOsAppGuid = { 0x282cae50, 0x940e, 0x11e5, {0xb7, 0xb8,
-  0x77, 0x42, 0x01, 0xc0, 0xf2, 0xd8} };
-
-// Need to keep the same with EslStartOs.inf
-// 8880a72c-9411-11e5-b6f0-97310bc151d1
-GUID gEslStartOsAppGuid = { 0x8880a72c, 0x9411, 0x11e5, {0xb6, 0xf0,
-  0x97, 0x31, 0x0b, 0xc1, 0x51, 0xd1} };
-
-EFI_STATUS
-BdsDeleteAllInvalidEfiBootOption (
-  VOID
-  );
-
-#define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) }
-
-
-#pragma pack (1)
-typedef struct {
-  VENDOR_DEVICE_PATH         SerialDxe;
-  UART_DEVICE_PATH           Uart;
-  VENDOR_DEFINED_DEVICE_PATH Vt100;
-  EFI_DEVICE_PATH_PROTOCOL   End;
-} PLATFORM_SERIAL_CONSOLE;
-#pragma pack ()
-
-#define SERIAL_DXE_FILE_GUID { \
-          0xD3987D4B, 0x971A, 0x435F, \
-          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
-          }
-
-STATIC PLATFORM_SERIAL_CONSOLE mSerialConsole = {
-  //
-  // VENDOR_DEVICE_PATH SerialDxe
-  //
-  {
-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DP_NODE_LEN (VENDOR_DEVICE_PATH) },
-    SERIAL_DXE_FILE_GUID
-  },
-
-  //
-  // UART_DEVICE_PATH Uart
-  //
-  {
-    { MESSAGING_DEVICE_PATH, MSG_UART_DP, DP_NODE_LEN (UART_DEVICE_PATH) },
-    0,                                      // Reserved
-    FixedPcdGet64 (PcdUartDefaultBaudRate), // BaudRate
-    FixedPcdGet8 (PcdUartDefaultDataBits),  // DataBits
-    FixedPcdGet8 (PcdUartDefaultParity),    // Parity
-    FixedPcdGet8 (PcdUartDefaultStopBits)   // StopBits
-  },
-
-  //
-  // VENDOR_DEFINED_DEVICE_PATH Vt100
-  //
-  {
-    {
-      MESSAGING_DEVICE_PATH, MSG_VENDOR_DP,
-      DP_NODE_LEN (VENDOR_DEFINED_DEVICE_PATH)
-    },
-    EFI_VT_100_GUID
-  },
-
-  //
-  // EFI_DEVICE_PATH_PROTOCOL End
-  //
-  {
-    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
-    DP_NODE_LEN (EFI_DEVICE_PATH_PROTOCOL)
-  }
-};
-
-
-#pragma pack (1)
-typedef struct {
-  USB_CLASS_DEVICE_PATH    Keyboard;
-  EFI_DEVICE_PATH_PROTOCOL End;
-} PLATFORM_USB_KEYBOARD;
-#pragma pack ()
-
-STATIC PLATFORM_USB_KEYBOARD mUsbKeyboard = {
-  //
-  // USB_CLASS_DEVICE_PATH Keyboard
-  //
-  {
-    {
-      MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP,
-      DP_NODE_LEN (USB_CLASS_DEVICE_PATH)
-    },
-    0xFFFF, // VendorId: any
-    0xFFFF, // ProductId: any
-    3,      // DeviceClass: HID
-    1,      // DeviceSubClass: boot
-    1       // DeviceProtocol: keyboard
-  },
-
-  //
-  // EFI_DEVICE_PATH_PROTOCOL End
-  //
-  {
-    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
-    DP_NODE_LEN (EFI_DEVICE_PATH_PROTOCOL)
-  }
-};
-
-STATIC
-UINT16
-GetBBSTypeFromFileSysPath (
-  IN CHAR16                   *UsbPathTxt,
-  IN CHAR16                   *FileSysPathTxt,
-  IN EFI_DEVICE_PATH_PROTOCOL *FileSysPath
-  )
-{
-  EFI_DEVICE_PATH_PROTOCOL *Node;
-
-  if (StrnCmp (UsbPathTxt, FileSysPathTxt, StrLen (UsbPathTxt)) == 0) {
-    Node = FileSysPath;
-    while (!IsDevicePathEnd (Node)) {
-      if ((DevicePathType (Node) == MEDIA_DEVICE_PATH) &&
-          (DevicePathSubType (Node) == MEDIA_CDROM_DP)) {
-        return BBS_TYPE_CDROM;
-      }
-      Node = NextDevicePathNode (Node);
-    }
-  }
-
-  return BBS_TYPE_UNKNOWN;
-}
-
-STATIC
-UINT16
-GetBBSTypeFromUsbPath (
-  IN CONST EFI_DEVICE_PATH_PROTOCOL *UsbPath
-  )
-{
-  EFI_STATUS                        Status;
-  EFI_HANDLE                        *FileSystemHandles;
-  UINTN                             NumberFileSystemHandles;
-  UINTN                             Index;
-  EFI_DEVICE_PATH_PROTOCOL          *FileSysPath;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevPathToText;
-  CHAR16                            *UsbPathTxt;
-  CHAR16                            *FileSysPathTxt;
-  UINT16                            Result;
-
-  Status = gBS->LocateProtocol (&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **) &DevPathToText);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "Locate DevicePathToTextPro %r\n", Status));
-    return BBS_TYPE_UNKNOWN;
-  }
-
-  Result = BBS_TYPE_UNKNOWN;
-  UsbPathTxt = DevPathToText->ConvertDevicePathToText (UsbPath, TRUE, TRUE);
-  if (UsbPathTxt == NULL) {
-    return Result;
-  }
-
-  Status = gBS->LocateHandleBuffer (
-                  ByProtocol,
-                  &gEfiSimpleFileSystemProtocolGuid,
-                  NULL,
-                  &NumberFileSystemHandles,
-                  &FileSystemHandles
-                  );
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "Locate SimpleFileSystemProtocol error(%r)\n", Status));
-    FreePool (UsbPathTxt);
-    return BBS_TYPE_UNKNOWN;
-  }
-
-  for (Index = 0; Index < NumberFileSystemHandles; Index++) {
-    FileSysPath = DevicePathFromHandle (FileSystemHandles[Index]);
-    FileSysPathTxt = DevPathToText->ConvertDevicePathToText (FileSysPath, TRUE, TRUE);
-
-    if (FileSysPathTxt == NULL) {
-      continue;
-    }
-
-    Result = GetBBSTypeFromFileSysPath (UsbPathTxt, FileSysPathTxt, FileSysPath);
-    FreePool (FileSysPathTxt);
-
-    if (Result != BBS_TYPE_UNKNOWN) {
-      break;
-    }
-  }
-
-  if (NumberFileSystemHandles != 0) {
-    FreePool (FileSystemHandles);
-  }
-
-  FreePool (UsbPathTxt);
-
-  return Result;
-}
-
-STATIC
-UINT16
-GetBBSTypeFromMessagingDevicePath (
-  IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,
-  IN EFI_DEVICE_PATH_PROTOCOL *Node
-  )
-{
-  VENDOR_DEVICE_PATH       *Vendor;
-  UINT16                   Result;
-
-  Result = BBS_TYPE_UNKNOWN;
-
-  switch (DevicePathSubType (Node)) {
-  case MSG_MAC_ADDR_DP:
-    Result = BBS_TYPE_EMBEDDED_NETWORK;
-    break;
-
-  case MSG_USB_DP:
-    Result = GetBBSTypeFromUsbPath (DevicePath);
-    if (Result == BBS_TYPE_UNKNOWN) {
-      Result =  BBS_TYPE_USB;
-    }
-    break;
-
-  case MSG_SATA_DP:
-    Result = BBS_TYPE_HARDDRIVE;
-    break;
-
-  case MSG_VENDOR_DP:
-    Vendor = (VENDOR_DEVICE_PATH *) (Node);
-    if ((&Vendor->Guid) != NULL) {
-      if (CompareGuid (&Vendor->Guid, &((EFI_GUID) DEVICE_PATH_MESSAGING_SAS))) {
-        Result = BBS_TYPE_HARDDRIVE;
-      }
-    }
-    break;
-
-  default:
-    Result = BBS_TYPE_UNKNOWN;
-    break;
-  }
-
-  return Result;
-}
-
-STATIC
-UINT16
-GetBBSTypeByDevicePath (
-  IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
-  )
-{
-  EFI_DEVICE_PATH_PROTOCOL *Node;
-  UINT16                   Result;
-
-  Result = BBS_TYPE_UNKNOWN;
-  if (DevicePath == NULL) {
-    return Result;
-  }
-
-  Node = DevicePath;
-  while (!IsDevicePathEnd (Node)) {
-    switch (DevicePathType (Node)) {
-    case MEDIA_DEVICE_PATH:
-      if (DevicePathSubType (Node) == MEDIA_CDROM_DP) {
-        Result = BBS_TYPE_CDROM;
-      }
-      break;
-
-    case MESSAGING_DEVICE_PATH:
-      Result = GetBBSTypeFromMessagingDevicePath (DevicePath, Node);
-      break;
-
-    default:
-      Result = BBS_TYPE_UNKNOWN;
-      break;
-    }
-
-    if (Result != BBS_TYPE_UNKNOWN) {
-      break;
-    }
-
-    Node = NextDevicePathNode (Node);
-  }
-
-  return Result;
-}
-
-STATIC
-EFI_STATUS
-GetBmcBootOptionsSetting (
-  OUT IPMI_GET_BOOT_OPTION *BmcBootOpt
-  )
-{
-  EFI_STATUS   Status;
-
-  Status = IpmiCmdGetSysBootOptions (BmcBootOpt);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "Get iBMC BootOpts %r!\n", Status));
-    return Status;
-  }
-
-  if (BmcBootOpt->BootFlagsValid != BOOT_OPTION_BOOT_FLAG_VALID) {
-    return EFI_NOT_FOUND;
-  }
-
-  if (BmcBootOpt->Persistent) {
-    BmcBootOpt->BootFlagsValid = BOOT_OPTION_BOOT_FLAG_VALID;
-  } else {
-    BmcBootOpt->BootFlagsValid = BOOT_OPTION_BOOT_FLAG_INVALID;
-  }
-
-  Status = IpmiCmdSetSysBootOptions (BmcBootOpt);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "Set iBMC BootOpts %r!\n", Status));
-  }
-
-  return Status;
-}
-
-STATIC
-VOID
-RestoreBootOrder (
-  VOID
-  )
-{
-  EFI_STATUS                Status;
-  UINT16                    *BootOrder;
-  UINTN                     BootOrderSize;
-
-  GetVariable2 (L"BootOrderBackup", &gOemBootVaraibleGuid, (VOID **) &BootOrder, &BootOrderSize);
-  if (BootOrder == NULL) {
-    return ;
-  }
-
-  Print (L"Restore BootOrder(%d).\n", BootOrderSize / sizeof (UINT16));
-
-  Status = gRT->SetVariable (
-                  L"BootOrder",
-                  &gEfiGlobalVariableGuid,
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                  BootOrderSize,
-                  BootOrder
-                  );
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "SetVariable BootOrder %r!\n", Status));
-  }
-
-  Status = gRT->SetVariable (
-                  L"BootOrderBackup",
-                  &gOemBootVaraibleGuid,
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                  0,
-                  NULL
-                  );
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "SetVariable BootOrderBackup %r!\n", Status));
-  }
-
-  FreePool (BootOrder);
-
-  return;
-}
-
-
-VOID
-RestoreBootOrderOnReadyToBoot (
-  IN EFI_EVENT        Event,
-  IN VOID             *Context
-  )
-{
-  // restore BootOrder variable in normal condition.
-  RestoreBootOrder ();
-}
-
-STATIC
-VOID
-UpdateBootOrder (
-  IN UINT16  *NewOrder,
-  IN UINT16  *BootOrder,
-  IN UINTN   BootOrderSize
-  )
-{
-  EFI_STATUS  Status;
-  EFI_EVENT   Event;
-
-  Status = gRT->SetVariable (
-                  L"BootOrderBackup",
-                  &gOemBootVaraibleGuid,
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                  BootOrderSize,
-                  BootOrder
-                  );
-  if (EFI_ERROR (Status)) {
-    return;
-  }
-
-  Status = gRT->SetVariable (
-                  L"BootOrder",
-                  &gEfiGlobalVariableGuid,
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                  BootOrderSize,
-                  NewOrder
-                  );
-  if (EFI_ERROR (Status)) {
-    return;
-  }
-
-  // Register notify function to restore BootOrder variable on ReadyToBoot Event.
-  Status = gBS->CreateEventEx (
-                  EVT_NOTIFY_SIGNAL,
-                  TPL_CALLBACK,
-                  RestoreBootOrderOnReadyToBoot,
-                  NULL,
-                  &gEfiEventReadyToBootGuid,
-                  &Event
-                  );
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "Create ready to boot event %r!\n", Status));
-  }
-
-  return;
-}
-
-STATIC
-VOID
-SetBootOrder (
-  IN UINT16 BootType
-  )
-{
-  UINT16                       *NewOrder;
-  UINT16                       *RemainBoots;
-  UINT16                       *BootOrder;
-  UINTN                        BootOrderSize;
-  CHAR16                       OptionName[sizeof ("Boot####")];
-  UINTN                        Index;
-  LIST_ENTRY                   BootOptionList;
-  BDS_COMMON_OPTION            *Option;
-  UINTN                        SelectCnt;
-  UINTN                        RemainCnt;
-
-  InitializeListHead (&BootOptionList);
-
-  GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrder, &BootOrderSize);
-  if (BootOrder == NULL) {
-    return ;
-  }
-
-  NewOrder = AllocatePool (BootOrderSize);
-  RemainBoots = AllocatePool (BootOrderSize);
-  if ((NewOrder == NULL) || (RemainBoots == NULL)) {
-    DEBUG ((DEBUG_ERROR, "Out of resources."));
-    goto Exit;
-  }
-
-  SelectCnt = 0;
-  RemainCnt = 0;
-
-  for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {
-    UnicodeSPrint (OptionName, sizeof (OptionName), L"Boot%04x", BootOrder[Index]);
-    Option = BdsLibVariableToOption (&BootOptionList, OptionName);
-    if (Option == NULL) {
-      DEBUG ((DEBUG_ERROR, "Boot%04x is invalid option!\n", BootOrder[Index]));
-      continue;
-    }
-
-    if (GetBBSTypeByDevicePath (Option->DevicePath) == BootType) {
-      NewOrder[SelectCnt++] = BootOrder[Index];
-    } else {
-      RemainBoots[RemainCnt++] = BootOrder[Index];
-    }
-  }
-
-  if (SelectCnt != 0) {
-    // append RemainBoots to NewOrder
-    for (Index = 0; Index < RemainCnt; Index++) {
-      NewOrder[SelectCnt + Index] = RemainBoots[Index];
-    }
-
-    if (CompareMem (NewOrder, BootOrder, BootOrderSize) != 0) {
-      UpdateBootOrder (NewOrder, BootOrder, BootOrderSize);
-    }
-  }
-
-Exit:
-  FreePool (BootOrder);
-  if (NewOrder != NULL) {
-    FreePool (NewOrder);
-  }
-  if (RemainBoots != NULL) {
-    FreePool (RemainBoots);
-  }
-
-  return ;
-}
-
-STATIC
-VOID
-HandleBmcBootType (
-  VOID
-  )
-{
-  EFI_STATUS                Status;
-  IPMI_GET_BOOT_OPTION      BmcBootOpt;
-  UINT16                    BootType;
-
-  Status = GetBmcBootOptionsSetting (&BmcBootOpt);
-  if (EFI_ERROR (Status)) {
-    return;
-  }
-
-  Print (L"Boot Type from BMC is %x\n", BmcBootOpt.BootDeviceSelector);
-
-  switch (BmcBootOpt.BootDeviceSelector) {
-  case ForcePxe:
-    BootType = BBS_TYPE_EMBEDDED_NETWORK;
-    break;
-
-  case ForcePrimaryRemovableMedia:
-    BootType = BBS_TYPE_USB;
-    break;
-
-  case ForceDefaultHardDisk:
-    BootType = BBS_TYPE_HARDDRIVE;
-    break;
-
-  case ForceDefaultCD:
-    BootType = BBS_TYPE_CDROM;
-    break;
-
-  default:
-    return;
-  }
-
-  SetBootOrder (BootType);
-}
-
-//
-// BDS Platform Functions
-//
-/**
-  Platform Bds init. Include the platform firmware vendor, revision
-  and so crc check.
-
-**/
-VOID
-EFIAPI
-PlatformBdsInit (
-  VOID
-  )
-{
-  //Signal EndofDxe Event
-  EfiEventGroupSignal(&gEfiEndOfDxeEventGroupGuid);
-
-  // restore BootOrder variable if previous BMC boot override attempt
-  // left it in a modified state
-  RestoreBootOrder ();
-}
-
-
-/**
-  Check if the handle satisfies a particular condition.
-
-  @param[in] Handle      The handle to check.
-  @param[in] ReportText  A caller-allocated string passed in for reporting
-                         purposes. It must never be NULL.
-
-  @retval TRUE   The condition is satisfied.
-  @retval FALSE  Otherwise. This includes the case when the condition could not
-                 be fully evaluated due to an error.
-**/
-typedef
-BOOLEAN
-(EFIAPI *FILTER_FUNCTION) (
-  IN EFI_HANDLE   Handle,
-  IN CONST CHAR16 *ReportText
-  );
-
-
-/**
-  Process a handle.
-
-  @param[in] Handle      The handle to process.
-  @param[in] ReportText  A caller-allocated string passed in for reporting
-                         purposes. It must never be NULL.
-**/
-typedef
-VOID
-(EFIAPI *CALLBACK_FUNCTION)  (
-  IN EFI_HANDLE   Handle,
-  IN CONST CHAR16 *ReportText
-  );
-
-/**
-  Locate all handles that carry the specified protocol, filter them with a
-  callback function, and pass each handle that passes the filter to another
-  callback.
-
-  @param[in] ProtocolGuid  The protocol to look for.
-
-  @param[in] Filter        The filter function to pass each handle to. If this
-                           parameter is NULL, then all handles are processed.
-
-  @param[in] Process       The callback function to pass each handle to that
-                           clears the filter.
-**/
-STATIC
-VOID
-FilterAndProcess (
-  IN EFI_GUID          *ProtocolGuid,
-  IN FILTER_FUNCTION   Filter         OPTIONAL,
-  IN CALLBACK_FUNCTION Process
-  )
-{
-  EFI_STATUS Status;
-  EFI_HANDLE *Handles;
-  UINTN      NoHandles;
-  UINTN      Idx;
-
-  Status = gBS->LocateHandleBuffer (ByProtocol, ProtocolGuid,
-                  NULL /* SearchKey */, &NoHandles, &Handles);
-  if (EFI_ERROR (Status)) {
-    //
-    // This is not an error, just an informative condition.
-    //
-    DEBUG ((EFI_D_VERBOSE, "%a: %g: %r\n", __FUNCTION__, ProtocolGuid,
-      Status));
-    return;
-  }
-
-  ASSERT (NoHandles > 0);
-  for (Idx = 0; Idx < NoHandles; ++Idx) {
-    CHAR16        *DevicePathText;
-    STATIC CHAR16 Fallback[] = L"<device path unavailable>";
-
-    //
-    // The ConvertDevicePathToText() function handles NULL input transparently.
-    //
-    DevicePathText = ConvertDevicePathToText (
-                       DevicePathFromHandle (Handles[Idx]),
-                       FALSE, // DisplayOnly
-                       FALSE  // AllowShortcuts
-                       );
-    if (DevicePathText == NULL) {
-      DevicePathText = Fallback;
-    }
-
-    if (Filter == NULL || Filter (Handles[Idx], DevicePathText)) {
-      Process (Handles[Idx], DevicePathText);
-    }
-
-    if (DevicePathText != Fallback) {
-      FreePool (DevicePathText);
-    }
-  }
-  gBS->FreePool (Handles);
-}
-
-
-/**
-  This FILTER_FUNCTION checks if a handle corresponds to a PCI display device.
-**/
-STATIC
-BOOLEAN
-EFIAPI
-IsPciDisplay (
-  IN EFI_HANDLE   Handle,
-  IN CONST CHAR16 *ReportText
-  )
-{
-  EFI_STATUS          Status;
-  EFI_PCI_IO_PROTOCOL *PciIo;
-  PCI_TYPE00          Pci;
-
-  Status = gBS->HandleProtocol (Handle, &gEfiPciIoProtocolGuid,
-                  (VOID**)&PciIo);
-  if (EFI_ERROR (Status)) {
-    //
-    // This is not an error worth reporting.
-    //
-    return FALSE;
-  }
-
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0 /* Offset */,
-                        sizeof Pci / sizeof (UINT32), &Pci);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
-    return FALSE;
-  }
-
-  return IS_PCI_DISPLAY (&Pci);
-}
-
-
-/**
-  This CALLBACK_FUNCTION attempts to connect a handle non-recursively, asking
-  the matching driver to produce all first-level child handles.
-**/
-STATIC
-VOID
-EFIAPI
-Connect (
-  IN EFI_HANDLE   Handle,
-  IN CONST CHAR16 *ReportText
-  )
-{
-  EFI_STATUS Status;
-
-  Status = gBS->ConnectController (
-                  Handle, // ControllerHandle
-                  NULL,   // DriverImageHandle
-                  NULL,   // RemainingDevicePath -- produce all children
-                  FALSE   // Recursive
-                  );
-  DEBUG ((EFI_ERROR (Status) ? EFI_D_ERROR : EFI_D_VERBOSE, "%a: %s: %r\n",
-    __FUNCTION__, ReportText, Status));
-}
-
-
-/**
-  This CALLBACK_FUNCTION retrieves the EFI_DEVICE_PATH_PROTOCOL from the
-  handle, and adds it to ConOut and ErrOut.
-**/
-STATIC
-VOID
-EFIAPI
-AddOutput (
-  IN EFI_HANDLE   Handle,
-  IN CONST CHAR16 *ReportText
-  )
-{
-  EFI_STATUS               Status;
-  EFI_DEVICE_PATH_PROTOCOL *DevicePath;
-
-  DevicePath = DevicePathFromHandle (Handle);
-  if (DevicePath == NULL) {
-    DEBUG ((EFI_D_ERROR, "%a: %s: handle %p: device path not found\n",
-      __FUNCTION__, ReportText, Handle));
-    return;
-  }
-
-  Status = BdsLibUpdateConsoleVariable (L"ConOut", DevicePath, NULL);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "%a: %s: adding to ConOut: %r\n", __FUNCTION__,
-      ReportText, Status));
-    return;
-  }
-
-  Status = BdsLibUpdateConsoleVariable (L"ErrOut", DevicePath, NULL);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "%a: %s: adding to ErrOut: %r\n", __FUNCTION__,
-      ReportText, Status));
-    return;
-  }
-
-  DEBUG ((EFI_D_VERBOSE, "%a: %s: added to ConOut and ErrOut\n", __FUNCTION__,
-    ReportText));
-}
-
-
-/**
-  The function will execute with as the platform policy, current policy
-  is driven by boot mode. IBV/OEM can customize this code for their specific
-  policy action.
-
-  @param  DriverOptionList        The header of the driver option link list
-  @param  BootOptionList          The header of the boot option link list
-  @param  ProcessCapsules         A pointer to ProcessCapsules()
-  @param  BaseMemoryTest          A pointer to BaseMemoryTest()
-
-**/
-VOID
-EFIAPI
-PlatformBdsPolicyBehavior (
-  IN LIST_ENTRY                      *DriverOptionList,
-  IN LIST_ENTRY                      *BootOptionList,
-  IN PROCESS_CAPSULES                ProcessCapsules,
-  IN BASEM_MEMORY_TEST               BaseMemoryTest
-  )
-{
-  EFI_STATUS Status;
-  //
-  // Locate the PCI root bridges and make the PCI bus driver connect each,
-  // non-recursively. This will produce a number of child handles with PciIo on
-  // them.
-  //
-  FilterAndProcess (&gEfiPciRootBridgeIoProtocolGuid, NULL, Connect);
-
-  //
-  // Find all display class PCI devices (using the handles from the previous
-  // step), and connect them non-recursively. This should produce a number of
-  // child handles with GOPs on them.
-  //
-  FilterAndProcess (&gEfiPciIoProtocolGuid, IsPciDisplay, Connect);
-
-  //
-  // Now add the device path of all handles with GOP on them to ConOut and
-  // ErrOut.
-  //
-  FilterAndProcess (&gEfiGraphicsOutputProtocolGuid, NULL, AddOutput);
-
-  //
-  // Add the hardcoded short-form USB keyboard device path to ConIn.
-  //
-  BdsLibUpdateConsoleVariable (L"ConIn",
-    (EFI_DEVICE_PATH_PROTOCOL *)&mUsbKeyboard, NULL);
-
-  //
-  // Add the hardcoded serial console device path to ConIn, ConOut, ErrOut.
-  //
-  BdsLibUpdateConsoleVariable (L"ConIn",
-    (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
-  BdsLibUpdateConsoleVariable (L"ConOut",
-    (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
-  BdsLibUpdateConsoleVariable (L"ErrOut",
-    (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
-
-  //
-  // Connect the consoles based on the above variables.
-  //
-  BdsLibConnectAllDefaultConsoles ();
-
-  //
-  // Show the splash screen.
-  //
-  EnableQuietBoot (PcdGetPtr (PcdLogoFile));
-
-  //
-  // Connect the rest of the devices.
-  //
-  BdsLibConnectAll ();
-
-  //
-  // Add memory test to convert memory above 4GB to be tested
-  //
-  Status = BaseMemoryTest (QUICK);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "[%a:%d] - Base memory test failed: %r\n", __FUNCTION__, __LINE__, Status));
-  }
-
-  //
-  // Process QEMU's -kernel command line option. Note that the kernel booted
-  // this way should receive ACPI tables, which is why we connect all devices
-  // first (see above) -- PCI enumeration blocks ACPI table installation, if
-  // there is a PCI host.
-  //
-  //TryRunningQemuKernel ();
-
-  BdsLibEnumerateAllBootOption (BootOptionList);
-
-  // Add Flash Start OS and ESL Start OS boot option
-  (VOID) HwBdsLibRegisterAppBootOption (BootOptionList, &gFlashStartOsAppGuid, L"Flash Start OS");
-  (VOID) HwBdsLibRegisterAppBootOption (BootOptionList, &gEslStartOsAppGuid, L"ESL Start OS");
-
-  // Add EBL as boot option
-  (VOID) HwBdsLibRegisterAppBootOption (BootOptionList, &gEblFileGuid, L"Embedded Boot Loader (EBL)");
-
-  // Remove EFI Misc Device Boot Options
-  BdsDeleteAllInvalidEfiBootOption ();
-
-  //SetBootOrderFromQemu (BootOptionList);
-  //
-  // The BootOrder variable may have changed, reload the in-memory list with
-  // it.
-  //
-  BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder");
-
-  //PlatformBdsEnterFrontPage (GetFrontPageTimeoutFromQemu(), TRUE);
-  Print (L"Press Enter to boot OS immediately.\n");
-  Print (L"Press any other key in %d seconds to stop automatical booting...\n", PcdGet16(PcdPlatformBootTimeOut));
-  PlatformBdsEnterFrontPage (PcdGet16(PcdPlatformBootTimeOut), TRUE);
-  HandleBmcBootType ();
-}
-
-/**
-  Hook point after a boot attempt succeeds. We don't expect a boot option to
-  return, so the UEFI 2.0 specification defines that you will default to an
-  interactive mode and stop processing the BootOrder list in this case. This
-  is also a platform implementation and can be customized by IBV/OEM.
-
-  @param  Option                  Pointer to Boot Option that succeeded to boot.
-
-**/
-VOID
-EFIAPI
-PlatformBdsBootSuccess (
-  IN  BDS_COMMON_OPTION *Option
-  )
-{
-}
-
-/**
-  Hook point after a boot attempt fails.
-
-  @param  Option                  Pointer to Boot Option that failed to boot.
-  @param  Status                  Status returned from failed boot.
-  @param  ExitData                Exit data returned from failed boot.
-  @param  ExitDataSize            Exit data size returned from failed boot.
-
-**/
-VOID
-EFIAPI
-PlatformBdsBootFail (
-  IN  BDS_COMMON_OPTION  *Option,
-  IN  EFI_STATUS         Status,
-  IN  CHAR16             *ExitData,
-  IN  UINTN              ExitDataSize
-  )
-{
-}
-
-/**
-  This function locks platform flash that is not allowed to be updated during normal boot path.
-  The flash layout is platform specific.
-**/
-VOID
-EFIAPI
-PlatformBdsLockNonUpdatableFlash (
-  VOID
-  )
-{
-  return;
-}
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
deleted file mode 100644
index 9ea701db11..0000000000
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/** @file
-*
-*  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.
-*
-**/
-
-#include "IntelBdsPlatform.h"
-#include <Library/UefiLib.h>
-#include <Library/GenericBdsLib.h>
-#include <Protocol/FirmwareVolume2.h>
-
-VOID
-EFIAPI
-BdsLibBuildOptionFromApp (
-  IN EFI_HANDLE                  Handle,
-  IN OUT LIST_ENTRY              *BdsBootOptionList,
-  IN GUID                        *FileGuid,
-  IN CHAR16                      *Description
-  )
-{
-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;
-  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH ShellNode;
-
-  DevicePath = DevicePathFromHandle (Handle);
-
-  //
-  // Build the shell device path
-  //
-  EfiInitializeFwVolDevicepathNode (&ShellNode, FileGuid);
-
-  DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);
-
-  //
-  // Create and register the shell boot option
-  //
-  BdsLibRegisterNewOption (BdsBootOptionList, DevicePath, Description, L"BootOrder");
-
-}
-EFI_STATUS
-EFIAPI
-HwBdsLibRegisterAppBootOption (
-  IN OUT LIST_ENTRY              *BdsBootOptionList,
-  IN GUID                        *FileGuid,
-  IN CHAR16                      *Description
-  )
-{
-  EFI_STATUS                    Status;
-  UINTN                         Index;
-  UINTN                         FvHandleCount;
-  EFI_HANDLE                    *FvHandleBuffer;
-  EFI_FV_FILETYPE               Type;
-  UINTN                         Size;
-  EFI_FV_FILE_ATTRIBUTES        Attributes;
-  UINT32                        AuthenticationStatus;
-  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
-  UINTN                         Count = 0;
-
-  //
-  // Check if we have on flash shell
-  //
-  gBS->LocateHandleBuffer (
-        ByProtocol,
-        &gEfiFirmwareVolume2ProtocolGuid,
-        NULL,
-        &FvHandleCount,
-        &FvHandleBuffer
-        );
-  for (Index = 0; Index < FvHandleCount; Index++) {
-    gBS->HandleProtocol (
-          FvHandleBuffer[Index],
-          &gEfiFirmwareVolume2ProtocolGuid,
-          (VOID **) &Fv
-          );
-
-    Status = Fv->ReadFile (
-                  Fv,
-                  FileGuid,
-                  NULL,
-                  &Size,
-                  &Type,
-                  &Attributes,
-                  &AuthenticationStatus
-                  );
-    if (EFI_ERROR (Status)) {
-      //
-      // Skip if no shell file in the FV
-      //
-      continue;
-    }
-    //
-    // Build the shell boot option
-    //
-    BdsLibBuildOptionFromApp (FvHandleBuffer[Index], BdsBootOptionList,
-        FileGuid, Description);
-
-    Count++;
-  }
-
-  if (FvHandleCount != 0) {
-    FreePool (FvHandleBuffer);
-  }
-
-  if (Count == 0) {
-    return EFI_NOT_FOUND;
-  }
-
-  return EFI_SUCCESS;
-}
-
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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 {
     <LibraryClasses>
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   }
 
   #
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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 {
     <LibraryClasses>
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   }
 
   #
-- 
2.12.0.windows.1

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

[Wu, Hao A]

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 <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
---
 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

Re: [edk2-devel] [PATCH 1/2] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

[Wu, Hao A]

Please ignore this patch.
It was sent by mistake.

Best Regards,
Hao Wu


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Wu,
> Hao A
> Sent: Tuesday, May 14, 2019 10:08 AM
> To: devel@edk2.groups.io
> Cc: Wu, Hao A; Ard Biesheuvel; Leif Lindholm; Kinney, Michael D
> Subject: [edk2-devel] [PATCH 1/2] Platform/BeagleBoard: Use
> ReportStatusCodeLib in MdeModulePkg
> 
> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  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/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
> 
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtr
> actGuidedSectionLib.inf
>    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
>  #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
> @@ -173,19 +173,19 @@
> 
> 
>  [LibraryClasses.common.DXE_DRIVER]
> -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
>    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/
> DxeSecurityManagementLib.inf
> 
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance
> Lib.inf
> 
> NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverab
> leDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
> 
>  [LibraryClasses.common.UEFI_APPLICATION]
> -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
> 
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance
> Lib.inf
>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> 
>  [LibraryClasses.common.UEFI_DRIVER]
> -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
> 
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtr
> actGuidedSectionLib.inf
> 
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance
> Lib.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/UefiMemory
> AllocationLib.inf
> -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/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
> 
> 
> 

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

[Wu, Hao A]

Please ignore this patch.
It was sent by mistake.

Best Regards,
Hao Wu


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Wu,
> Hao A
> Sent: Tuesday, May 14, 2019 10:08 AM
> To: devel@edk2.groups.io
> Cc: Wu, Hao A; Ard Biesheuvel; Leif Lindholm; Kinney, Michael D
> Subject: [edk2-devel] [PATCH 2/2] Platform/BeagleBoard: Drop the consume of
> PcdShellFile
> 
> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  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
> 
> 
> 

Re: [edk2-devel] [edk2-platforms][PATCH v1 00/16] Drop IntelFramework[Module]Pkg dependency

[Wu, Hao A]

Sorry to mention, this series is also available at:
https://github.com/hwu25/edk2-platforms/tree/drop_intelframework_part1_v1

Best Regards,
Hao Wu


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Wu,
> Hao A
> Sent: Tuesday, May 14, 2019 10:08 AM
> To: devel@edk2.groups.io
> Cc: Wu, Hao A; Ard Biesheuvel; Leif Lindholm; Kinney, Michael D
> Subject: [edk2-devel] [edk2-platforms][PATCH v1 00/16] Drop
> IntelFramework[Module]Pkg dependency
> 
> This series will drop the IntelFramework[Module]Pkg dependency for
> platforms within the edk2-platforms repo. This is the 1st part series,
> which will handle platforms only with explicit dependency on the framework
> packages.
> 
> The affected platforms include:
> * Platform/AMD/OverdriveBoard
> * Platform/BeagleBoard
> * Platform/Hisilicon/D0x
> * Platform/LeMaker/CelloBoard
> * Platform/SoftIron/Overdrive1000Board
> 
> Tests done:
> Build verified for the above affected platforms.
> 
> Please note that for:
> * Platform/Intel/QuarkPlatformPkg
> * Vlv2TbltDevicePkg
> 
> They will handle by some one else with another patch sereis.
> 
> And for:
> * Platform/RaspberryPi/RPi3
> 
> It has implicit dependency on the framework packages, and will be handled
> in the part 2 series.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Hao A Wu (16):
>   Platform/AMD: Use Lzma decompress lib in MdeModulePkg
>   Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg
>   Platform/BeagleBoard: Drop the consume of PcdShellFile
>   Hisilicon/D0x: Use Lzma decompress lib in MdeModulePkg
>   Hisilicon/D0x: Drop the consume of GenericBdsLib & PlatformBdsLib
>   Hisilicon/D0x: Use StatusCode Router & Handler in MdeModulePkg
>   Hisilicon/D06: Drop the consume of PcdShellFile
>   Silicon/Hisilicon: Use Lzma decompress lib in MdeModulePkg
>   Silicon/Hisilicon: Use ReportStatusCodeLib (DXE) in MdeModulePkg
>   Silicon/Hisilicon: Use DebugLib (DXE_RUNTIME_DRIVER) in MdeModulePkg
>   Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency
>   Silicon/Hisilicon/PlatformIntelBdsLib: Remove Hisilicon PlatformBdsLib
>   Platform/LeMaker: Use Lzma decompress lib in MdeModulePkg
>   Platform/LeMaker: Use ReportStatusCodeLib in MdeModulePkg
>   Platform/SoftIron: Use Lzma decompress lib in MdeModulePkg
>   Platform/SoftIron: Use ReportStatusCodeLib in MdeModulePkg
> 
>  Silicon/Hisilicon/Hisilicon.dsc.inc                                                       |  10 +-
>  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> |   2 +-
>  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> |  13 +-
>  Platform/Hisilicon/D03/D03.dsc                                                            |  10 +-
>  Platform/Hisilicon/D05/D05.dsc                                                            |  10 +-
>  Platform/Hisilicon/D06/D06.dsc                                                            |   8 +-
>  Platform/LeMaker/CelloBoard/CelloBoard.dsc                                                |
> 10 +-
>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> |  10 +-
>  Platform/Hisilicon/D03/D03.fdf                                                            |   6 +-
>  Platform/Hisilicon/D05/D05.fdf                                                            |   6 +-
>  Platform/Hisilicon/D06/D06.fdf                                                            |   6 +-
>  Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf
> |   2 -
> 
> Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.i
> nf            |   1 -
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
> |   2 -
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
> |  84 --
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h
> |   1 -
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
> |  61 --
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
> |  27 -
>  Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> |   4 +-
> 
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFuncti
> on.c            |   4 +-
> 
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufact
> urerFunction.c    |   4 +-
> 
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManuf
> acturerFunction.c |   4 +-
> 
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufact
> urerFunction.c   |   2 +-
> 
> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesig
> nationFunction.c |   4 +-
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
> | 963 --------------------
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
> | 118 ---
>  26 files changed, 57 insertions(+), 1315 deletions(-)
>  delete mode 100644
> Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
>  delete mode 100644
> Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
>  delete mode 100644
> Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
>  delete mode 100644
> Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
>  delete mode 100644
> Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
> 
> --
> 2.12.0.windows.1
> 
> 
> 

Re: [PATCH 1/2] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

[Leif Lindholm]

On Tue, May 14, 2019 at 10:08:15AM +0800, 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.

Please reword this statement.
Certainly the changes are minor, but there is definitely functional
difference there.

No concern with the change itself.

/
    Leif

> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  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
> 

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

[Leif Lindholm]

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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

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

> ---
>  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
> 
> 
> 
> 

Re: [edk2-devel] [PATCH 1/2] Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg

[Wu, Hao A]

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Leif
> Lindholm
> Sent: Tuesday, May 14, 2019 11:13 PM
> To: Wu, Hao A
> Cc: devel@edk2.groups.io; Ard Biesheuvel; Kinney, Michael D
> Subject: Re: [edk2-devel] [PATCH 1/2] Platform/BeagleBoard: Use
> ReportStatusCodeLib in MdeModulePkg
> 
> On Tue, May 14, 2019 at 10:08:15AM +0800, 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.
> 
> Please reword this statement.
> Certainly the changes are minor, but there is definitely functional
> difference there.

Thanks Leif, I will refine the comments.

Actually, this patch was sent out by accident and it is already included in the series:
https://edk2.groups.io/g/devel/topic/31614319

Could you help to review that series instead? Sorry for the inconvenience.

Best Regards,
Hao Wu

> 
> No concern with the change itself.
> 
> /
>     Leif
> 
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> > ---
> >  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/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> > +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
> >
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtr
> actGuidedSectionLib.inf
> >    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> >  #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
> > @@ -173,19 +173,19 @@
> >
> >
> >  [LibraryClasses.common.DXE_DRIVER]
> > -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> > +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
> >    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> >
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/
> DxeSecurityManagementLib.inf
> >
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance
> Lib.inf
> >
> NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverab
> leDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
> >
> >  [LibraryClasses.common.UEFI_APPLICATION]
> > -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> > +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
> >
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance
> Lib.inf
> >    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >
> >  [LibraryClasses.common.UEFI_DRIVER]
> > -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/DxeReportStatusCodeLib.inf
> > +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRep
> ortStatusCodeLib.inf
> >
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtr
> actGuidedSectionLib.inf
> >
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance
> Lib.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/UefiMemory
> AllocationLib.inf
> > -
> ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCode
> LibFramework/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
> >
> 
> 

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

[Leif Lindholm]

On Tue, May 14, 2019 at 10:08:17AM +0800, 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.

Responding the same as when I replied to the patch sent by accident:
This is inaccurate - there are non-trivial differences which could
definitely impact runtime behaviour. This patch definitely needs
testing, and the message needs rewording.

/
    Leif

> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  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
> 
> 
> 
> 

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

[Leif Lindholm]

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.

/
    Leif

> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  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
> +  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
>    #
>    #ACPI
>    #
> diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
> index c1cd13b6c7..0c12181a38 100644
> --- a/Platform/Hisilicon/D06/D06.dsc
> +++ b/Platform/Hisilicon/D06/D06.dsc
> @@ -255,7 +255,8 @@
>    ArmPlatformPkg/PlatformPei/PlatformPeim.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
>  
> @@ -317,7 +318,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/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
> index 3f07b2e577..f7024f400d 100644
> --- a/Platform/Hisilicon/D03/D03.fdf
> +++ b/Platform/Hisilicon/D03/D03.fdf
> @@ -199,7 +199,8 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
>    INF FatPkg/EnhancedFatDxe/Fat.inf
>    INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> -  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
>  
>    #
>    # Usb Support
> @@ -329,7 +330,8 @@ READ_LOCK_STATUS   = TRUE
>    INF Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf
>    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
>    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> -  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> +  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
>    INF Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
>  
>    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
> index 9632aea4b0..76c04b2740 100644
> --- a/Platform/Hisilicon/D05/D05.fdf
> +++ b/Platform/Hisilicon/D05/D05.fdf
> @@ -203,7 +203,8 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
>    INF FatPkg/EnhancedFatDxe/Fat.inf
>    INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> -  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
>  
>    #
>    # Usb Support
> @@ -351,7 +352,8 @@ READ_LOCK_STATUS   = TRUE
>    INF Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf
>    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
>    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> -  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> +  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
>    INF Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
>  
>    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
> index e402628a1b..fb26881300 100644
> --- a/Platform/Hisilicon/D06/D06.fdf
> +++ b/Platform/Hisilicon/D06/D06.fdf
> @@ -204,7 +204,8 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
>    INF FatPkg/EnhancedFatDxe/Fat.inf
>    INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> -  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
>  
>    #
>    # Usb Support
> @@ -345,7 +346,8 @@ READ_LOCK_STATUS   = TRUE
>    INF Platform/Hisilicon/D06/MemoryInitPei/MemoryInitPeim.inf
>    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
>    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> -  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> +  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
>    INF Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
>  
>    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> -- 
> 2.12.0.windows.1
> 

Re: [edk2-devel] [edk2-platforms][PATCH v1 09/16] Silicon/Hisilicon: Use ReportStatusCodeLib (DXE) in MdeModulePkg

[Leif Lindholm]

On Tue, May 14, 2019 at 10:08:24AM +0800, Wu, Hao A wrote:
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800
> 
> This commit will update the DSC.INC 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.

This is inaccurate - there are non-trivial differences which could
definitely impact runtime behaviour. This patch definitely needs
testing, and the message needs rewording.

/
    Leif

> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  Silicon/Hisilicon/Hisilicon.dsc.inc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
> index 72ba540a75..ea12b8da0b 100644
> --- a/Silicon/Hisilicon/Hisilicon.dsc.inc
> +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
> @@ -170,13 +170,13 @@
>    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
>    PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
>  
>  [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
> @@ -193,7 +193,7 @@
>    UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.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
> -- 
> 2.12.0.windows.1
> 
> 
> 
> 

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

[Leif Lindholm]

On Tue, May 14, 2019 at 10:08:29AM +0800, 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.

This is inaccurate - there are non-trivial differences which could
definitely impact runtime behaviour. This patch definitely needs
testing, and the message needs rewording.

/
    Leif

> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> ---
>  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
> 

Re: [edk2-platforms][PATCH v1 00/16] Drop IntelFramework[Module]Pkg dependency

[Leif Lindholm]

Hi,

For patches 1,3-5,7-8,10-13,15:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

However, since we have not yet changed the license for edk2-platforms,
I still need Contributed-under on all of these before I push.
I have a branch prepared, so all I need is a confirmation by an email
to the list that the set is intended to be
Contributed-under: TianoCore Contribution Agreement 1.1
.

Best Regards,

Leif

On Tue, May 14, 2019 at 10:08:13AM +0800, Hao A Wu wrote:
> This series will drop the IntelFramework[Module]Pkg dependency for
> platforms within the edk2-platforms repo. This is the 1st part series,
> which will handle platforms only with explicit dependency on the framework
> packages.
> 
> The affected platforms include:
> * Platform/AMD/OverdriveBoard
> * Platform/BeagleBoard
> * Platform/Hisilicon/D0x
> * Platform/LeMaker/CelloBoard
> * Platform/SoftIron/Overdrive1000Board
> 
> Tests done:
> Build verified for the above affected platforms.
> 
> Please note that for:
> * Platform/Intel/QuarkPlatformPkg
> * Vlv2TbltDevicePkg
> 
> They will handle by some one else with another patch sereis.
> 
> And for:
> * Platform/RaspberryPi/RPi3
> 
> It has implicit dependency on the framework packages, and will be handled
> in the part 2 series.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Hao A Wu (16):
>   Platform/AMD: Use Lzma decompress lib in MdeModulePkg
>   Platform/BeagleBoard: Use ReportStatusCodeLib in MdeModulePkg
>   Platform/BeagleBoard: Drop the consume of PcdShellFile
>   Hisilicon/D0x: Use Lzma decompress lib in MdeModulePkg
>   Hisilicon/D0x: Drop the consume of GenericBdsLib & PlatformBdsLib
>   Hisilicon/D0x: Use StatusCode Router & Handler in MdeModulePkg
>   Hisilicon/D06: Drop the consume of PcdShellFile
>   Silicon/Hisilicon: Use Lzma decompress lib in MdeModulePkg
>   Silicon/Hisilicon: Use ReportStatusCodeLib (DXE) in MdeModulePkg
>   Silicon/Hisilicon: Use DebugLib (DXE_RUNTIME_DRIVER) in MdeModulePkg
>   Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency
>   Silicon/Hisilicon/PlatformIntelBdsLib: Remove Hisilicon PlatformBdsLib
>   Platform/LeMaker: Use Lzma decompress lib in MdeModulePkg
>   Platform/LeMaker: Use ReportStatusCodeLib in MdeModulePkg
>   Platform/SoftIron: Use Lzma decompress lib in MdeModulePkg
>   Platform/SoftIron: Use ReportStatusCodeLib in MdeModulePkg
> 
>  Silicon/Hisilicon/Hisilicon.dsc.inc                                                       |  10 +-
>  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc                                            |   2 +-
>  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc                                    |  13 +-
>  Platform/Hisilicon/D03/D03.dsc                                                            |  10 +-
>  Platform/Hisilicon/D05/D05.dsc                                                            |  10 +-
>  Platform/Hisilicon/D06/D06.dsc                                                            |   8 +-
>  Platform/LeMaker/CelloBoard/CelloBoard.dsc                                                |  10 +-
>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc                               |  10 +-
>  Platform/Hisilicon/D03/D03.fdf                                                            |   6 +-
>  Platform/Hisilicon/D05/D05.fdf                                                            |   6 +-
>  Platform/Hisilicon/D06/D06.fdf                                                            |   6 +-
>  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/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf                     |  84 --
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h                               |   1 -
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h                          |  61 --
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h                    |  27 -
>  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 +-
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c                          | 963 --------------------
>  Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c                    | 118 ---
>  26 files changed, 57 insertions(+), 1315 deletions(-)
>  delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
>  delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
>  delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
>  delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
>  delete mode 100644 Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
> 
> -- 
> 2.12.0.windows.1
> 

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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 {
>      <LibraryClasses>
> -      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>    }
>
>    #
> --
> 2.12.0.windows.1
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Wu, Hao A <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

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
>
>
> 
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 17:13, Leif Lindholm <leif.lindholm@linaro.org> 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 <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>
> > ---
> >  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
> >
> >
> > 
> >

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Wu, Hao A <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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 {
>      <LibraryClasses>
> -      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 {
>      <LibraryClasses>
> -      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>    }
>
>    #
> --
> 2.12.0.windows.1
>
>
> 
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Wu, Hao A <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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
>
>
> 
>

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

[Ard Biesheuvel]

On Wed, 15 May 2019 at 21:47, Leif Lindholm <leif.lindholm@linaro.org> 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 <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> > ---
> >  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
> > +  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
> >    #
> >    #ACPI
> >    #
> > diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
> > index c1cd13b6c7..0c12181a38 100644
> > --- a/Platform/Hisilicon/D06/D06.dsc
> > +++ b/Platform/Hisilicon/D06/D06.dsc
> > @@ -255,7 +255,8 @@
> >    ArmPlatformPkg/PlatformPei/PlatformPeim.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
> >
> > @@ -317,7 +318,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/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
> > index 3f07b2e577..f7024f400d 100644
> > --- a/Platform/Hisilicon/D03/D03.fdf
> > +++ b/Platform/Hisilicon/D03/D03.fdf
> > @@ -199,7 +199,8 @@ READ_LOCK_STATUS   = TRUE
> >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> >    INF FatPkg/EnhancedFatDxe/Fat.inf
> >    INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > -  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> > +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> > +  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
> >
> >    #
> >    # Usb Support
> > @@ -329,7 +330,8 @@ READ_LOCK_STATUS   = TRUE
> >    INF Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf
> >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > -  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> > +  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> >    INF Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> >
> >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
> > index 9632aea4b0..76c04b2740 100644
> > --- a/Platform/Hisilicon/D05/D05.fdf
> > +++ b/Platform/Hisilicon/D05/D05.fdf
> > @@ -203,7 +203,8 @@ READ_LOCK_STATUS   = TRUE
> >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> >    INF FatPkg/EnhancedFatDxe/Fat.inf
> >    INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > -  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> > +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> > +  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
> >
> >    #
> >    # Usb Support
> > @@ -351,7 +352,8 @@ READ_LOCK_STATUS   = TRUE
> >    INF Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf
> >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > -  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> > +  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> >    INF Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> >
> >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
> > index e402628a1b..fb26881300 100644
> > --- a/Platform/Hisilicon/D06/D06.fdf
> > +++ b/Platform/Hisilicon/D06/D06.fdf
> > @@ -204,7 +204,8 @@ READ_LOCK_STATUS   = TRUE
> >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> >    INF FatPkg/EnhancedFatDxe/Fat.inf
> >    INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > -  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
> > +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
> > +  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
> >
> >    #
> >    # Usb Support
> > @@ -345,7 +346,8 @@ READ_LOCK_STATUS   = TRUE
> >    INF Platform/Hisilicon/D06/MemoryInitPei/MemoryInitPeim.inf
> >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > -  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > +  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
> > +  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> >    INF Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> >
> >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > --
> > 2.12.0.windows.1
> >

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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|0x94010000
>    gHisiTokenSpaceGuid.PcdMailBoxAddress|0x0000FFF8
> --
> 2.12.0.windows.1
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---
>  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
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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 <FrameworkDxe.h>
>  #include <Protocol/Smbios.h>
>  #include <IndustryStandard/SmBios.h>
>  #include <Library/HiiLib.h>
> 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 <FrameworkDxe.h>
> -
>  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         = NULL;
> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> index 9a42f04085..6c15a804c2 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> @@ -128,8 +128,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
>      CHAR16                *ReleaseDate;
>      CHAR16                *Char16String;
>      EFI_STATUS            Status;
> -    STRING_REF            TokenToUpdate;
> -    STRING_REF            TokenToGet;
> +    EFI_STRING_ID         TokenToUpdate;
> +    EFI_STRING_ID         TokenToGet;
>      SMBIOS_TABLE_TYPE0    *SmbiosRecord;
>      EFI_SMBIOS_HANDLE     SmbiosHandle;
>      SMBIOS_TABLE_TYPE0    *InputData;
> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> index 5e965c996c..8baf0bbc67 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> @@ -52,12 +52,12 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer)
>      EFI_STRING                      SerialNumber;
>      EFI_STRING                      SKUNumber;
>      EFI_STRING                      Family;
> -    STRING_REF                      TokenToGet;
> +    EFI_STRING_ID                   TokenToGet;
>      EFI_SMBIOS_HANDLE               SmbiosHandle;
>      SMBIOS_TABLE_TYPE1              *SmbiosRecord;
>      SMBIOS_TABLE_TYPE1              *InputData;
>      EFI_STATUS                      Status;
> -    STRING_REF                      TokenToUpdate;
> +    EFI_STRING_ID                   TokenToUpdate;
>      CHAR16                          *Product;
>      CHAR16                          *pVersion;
>
> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> index a141f9e7d7..cef6887d3f 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> @@ -54,13 +54,13 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
>      EFI_STRING                        SerialNumber;
>      EFI_STRING                        AssetTag;
>      EFI_STRING                        ChassisLocation;
> -    STRING_REF                        TokenToGet;
> +    EFI_STRING_ID                     TokenToGet;
>      EFI_SMBIOS_HANDLE                 SmbiosHandle;
>      SMBIOS_TABLE_TYPE2                *SmbiosRecord;
>      SMBIOS_TABLE_TYPE2                *InputData = NULL;
>      EFI_STATUS                        Status;
>
> -    STRING_REF                        TokenToUpdate;
> +    EFI_STRING_ID                     TokenToUpdate;
>      //CHAR16                            *ProductName;
>      //CHAR16                            *pVersion;
>      //uniBIOS_y00216284_018_end 2015-1-13 09:08:22
> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> index 4bb170117d..6f6f354b91 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> @@ -67,7 +67,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer)
>      EFI_STRING                      SerialNumber;
>      EFI_STRING                      AssertTag;
>      EFI_STRING                      ChassisSkuNumber;
> -    STRING_REF                      TokenToGet;
> +    EFI_STRING_ID                   TokenToGet;
>      EFI_SMBIOS_HANDLE               SmbiosHandle;
>      SMBIOS_TABLE_TYPE3              *SmbiosRecord;
>      SMBIOS_TABLE_TYPE3              *InputData;
> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
> index 945fd4c6e3..0fa4903460 100644
> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
> @@ -29,7 +29,7 @@ UpdateSlotDesignation (
>    IN SMBIOS_TABLE_TYPE9 *InputData
>    )
>  {
> -    STRING_REF                      TokenToUpdate;
> +    EFI_STRING_ID                   TokenToUpdate;
>      CHAR16                          *SlotDesignation;
>      UINTN                           DesignationStrLen;
>
> @@ -140,7 +140,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignation)
>      UINTN                              SlotDesignationStrLen;
>      EFI_STATUS                         Status;
>      EFI_STRING                         SlotDesignation;
> -    STRING_REF                         TokenToGet;
> +    EFI_STRING_ID                      TokenToGet;
>      SMBIOS_TABLE_TYPE9                 *SmbiosRecord;
>      EFI_SMBIOS_HANDLE                  SmbiosHandle;
>      SMBIOS_TABLE_TYPE9                 *InputData = NULL;
> --
> 2.12.0.windows.1
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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..0000000000
> --- 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.<BR>
> -#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
> -#  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..0000000000
> --- 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.<BR>
> -  Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
> -  Copyright (c) 2015, Linaro Limited. All rights reserved.<BR>
> -
> -  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/
> -
> -**/
> -
> -#ifndef _INTEL_BDS_PLATFORM_H_
> -#define _INTEL_BDS_PLATFORM_H_
> -
> -#include <Library/BaseLib.h>
> -#include <Library/BaseMemoryLib.h>
> -#include <Library/DebugLib.h>
> -#include <Library/DevicePathLib.h>
> -#include <Library/MemoryAllocationLib.h>
> -#include <Library/UefiBootServicesTableLib.h>
> -#include <Library/UefiRuntimeServicesTableLib.h>
> -
> -#include "IntelBdsPlatformCommon.h"
> -
> -VOID
> -PlatformBdsEnterFrontPage (
> -  IN UINT16                 TimeoutDefault,
> -  IN BOOLEAN                ConnectAllHappened
> -  );
> -
> -/**
> -  Download the kernel, the initial ramdisk, and the kernel command line from
> -  QEMU's fw_cfg. Construct a minimal SimpleFileSystem that contains the two
> -  image files, and load and start the kernel from it.
> -
> -  The kernel will be instructed via its command line to load the initrd from
> -  the same Simple FileSystem.
> -
> -  @retval EFI_NOT_FOUND         Kernel image was not found.
> -  @retval EFI_OUT_OF_RESOURCES  Memory allocation failed.
> -  @retval EFI_PROTOCOL_ERROR    Unterminated kernel command line.
> -
> -  @return                       Error codes from any of the underlying
> -                                functions. On success, the function doesn't
> -                                return.
> -**/
> -EFI_STATUS
> -EFIAPI
> -TryRunningQemuKernel (
> -  VOID
> -  );
> -
> -#endif // _INTEL_BDS_PLATFORM_H
> diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
> deleted file mode 100644
> index 73b901ab51..0000000000
> --- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -/** @file
> -*
> -*  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.
> -*
> -**/
> -
> -#ifndef _HW_BDS_LIB_H_
> -#define _HW_BDS_LIB_H_
> -
> -EFI_STATUS
> -EFIAPI
> -HwBdsLibRegisterAppBootOption (
> -  IN OUT LIST_ENTRY              *BdsBootOptionList,
> -  IN GUID                        *FileGuid,
> -  IN CHAR16                      *Description
> -  );
> -
> -#endif
> diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
> deleted file mode 100644
> index dc23e46c1f..0000000000
> --- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
> +++ /dev/null
> @@ -1,963 +0,0 @@
> -/** @file
> -  Implementation for PlatformBdsLib library class interfaces.
> -
> -  Copyright (C) 2015, Red Hat, Inc.
> -  Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
> -  Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
> -  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/
> -
> -**/
> -
> -#include <IndustryStandard/Pci22.h>
> -#include <Library/DevicePathLib.h>
> -#include <Library/GenericBdsLib.h>
> -#include <Library/IpmiCmdLib.h>
> -#include <Library/PcdLib.h>
> -#include <Library/PlatformBdsLib.h>
> -#include <Library/PrintLib.h>
> -#include <Library/UefiLib.h>
> -#include <Protocol/DevicePath.h>
> -#include <Protocol/DevicePathToText.h>
> -#include <Protocol/GraphicsOutput.h>
> -#include <Protocol/PciIo.h>
> -#include <Protocol/PciRootBridgeIo.h>
> -#include <Guid/GlobalVariable.h>
> -
> -#include "IntelBdsPlatform.h"
> -
> -GUID gOemBootVaraibleGuid = {0xb7784577, 0x5aaf, 0x4557, {0xa1, 0x99,
> -  0xd4, 0xa4, 0x2f, 0x45, 0x06, 0xf8} };
> -
> -//3CEF354A-3B7A-4519-AD70-72A134698311
> -GUID gEblFileGuid = {0x3CEF354A, 0x3B7A, 0x4519, {0xAD, 0x70,
> -  0x72, 0xA1, 0x34, 0x69, 0x83, 0x11} };
> -
> -// Need to keep the same with FlashStartOs.inf
> -// 282cae50-940e-11e5-b7b8-774201c0f2d8
> -GUID gFlashStartOsAppGuid = { 0x282cae50, 0x940e, 0x11e5, {0xb7, 0xb8,
> -  0x77, 0x42, 0x01, 0xc0, 0xf2, 0xd8} };
> -
> -// Need to keep the same with EslStartOs.inf
> -// 8880a72c-9411-11e5-b6f0-97310bc151d1
> -GUID gEslStartOsAppGuid = { 0x8880a72c, 0x9411, 0x11e5, {0xb6, 0xf0,
> -  0x97, 0x31, 0x0b, 0xc1, 0x51, 0xd1} };
> -
> -EFI_STATUS
> -BdsDeleteAllInvalidEfiBootOption (
> -  VOID
> -  );
> -
> -#define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >> 8) }
> -
> -
> -#pragma pack (1)
> -typedef struct {
> -  VENDOR_DEVICE_PATH         SerialDxe;
> -  UART_DEVICE_PATH           Uart;
> -  VENDOR_DEFINED_DEVICE_PATH Vt100;
> -  EFI_DEVICE_PATH_PROTOCOL   End;
> -} PLATFORM_SERIAL_CONSOLE;
> -#pragma pack ()
> -
> -#define SERIAL_DXE_FILE_GUID { \
> -          0xD3987D4B, 0x971A, 0x435F, \
> -          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
> -          }
> -
> -STATIC PLATFORM_SERIAL_CONSOLE mSerialConsole = {
> -  //
> -  // VENDOR_DEVICE_PATH SerialDxe
> -  //
> -  {
> -    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DP_NODE_LEN (VENDOR_DEVICE_PATH) },
> -    SERIAL_DXE_FILE_GUID
> -  },
> -
> -  //
> -  // UART_DEVICE_PATH Uart
> -  //
> -  {
> -    { MESSAGING_DEVICE_PATH, MSG_UART_DP, DP_NODE_LEN (UART_DEVICE_PATH) },
> -    0,                                      // Reserved
> -    FixedPcdGet64 (PcdUartDefaultBaudRate), // BaudRate
> -    FixedPcdGet8 (PcdUartDefaultDataBits),  // DataBits
> -    FixedPcdGet8 (PcdUartDefaultParity),    // Parity
> -    FixedPcdGet8 (PcdUartDefaultStopBits)   // StopBits
> -  },
> -
> -  //
> -  // VENDOR_DEFINED_DEVICE_PATH Vt100
> -  //
> -  {
> -    {
> -      MESSAGING_DEVICE_PATH, MSG_VENDOR_DP,
> -      DP_NODE_LEN (VENDOR_DEFINED_DEVICE_PATH)
> -    },
> -    EFI_VT_100_GUID
> -  },
> -
> -  //
> -  // EFI_DEVICE_PATH_PROTOCOL End
> -  //
> -  {
> -    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
> -    DP_NODE_LEN (EFI_DEVICE_PATH_PROTOCOL)
> -  }
> -};
> -
> -
> -#pragma pack (1)
> -typedef struct {
> -  USB_CLASS_DEVICE_PATH    Keyboard;
> -  EFI_DEVICE_PATH_PROTOCOL End;
> -} PLATFORM_USB_KEYBOARD;
> -#pragma pack ()
> -
> -STATIC PLATFORM_USB_KEYBOARD mUsbKeyboard = {
> -  //
> -  // USB_CLASS_DEVICE_PATH Keyboard
> -  //
> -  {
> -    {
> -      MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP,
> -      DP_NODE_LEN (USB_CLASS_DEVICE_PATH)
> -    },
> -    0xFFFF, // VendorId: any
> -    0xFFFF, // ProductId: any
> -    3,      // DeviceClass: HID
> -    1,      // DeviceSubClass: boot
> -    1       // DeviceProtocol: keyboard
> -  },
> -
> -  //
> -  // EFI_DEVICE_PATH_PROTOCOL End
> -  //
> -  {
> -    END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
> -    DP_NODE_LEN (EFI_DEVICE_PATH_PROTOCOL)
> -  }
> -};
> -
> -STATIC
> -UINT16
> -GetBBSTypeFromFileSysPath (
> -  IN CHAR16                   *UsbPathTxt,
> -  IN CHAR16                   *FileSysPathTxt,
> -  IN EFI_DEVICE_PATH_PROTOCOL *FileSysPath
> -  )
> -{
> -  EFI_DEVICE_PATH_PROTOCOL *Node;
> -
> -  if (StrnCmp (UsbPathTxt, FileSysPathTxt, StrLen (UsbPathTxt)) == 0) {
> -    Node = FileSysPath;
> -    while (!IsDevicePathEnd (Node)) {
> -      if ((DevicePathType (Node) == MEDIA_DEVICE_PATH) &&
> -          (DevicePathSubType (Node) == MEDIA_CDROM_DP)) {
> -        return BBS_TYPE_CDROM;
> -      }
> -      Node = NextDevicePathNode (Node);
> -    }
> -  }
> -
> -  return BBS_TYPE_UNKNOWN;
> -}
> -
> -STATIC
> -UINT16
> -GetBBSTypeFromUsbPath (
> -  IN CONST EFI_DEVICE_PATH_PROTOCOL *UsbPath
> -  )
> -{
> -  EFI_STATUS                        Status;
> -  EFI_HANDLE                        *FileSystemHandles;
> -  UINTN                             NumberFileSystemHandles;
> -  UINTN                             Index;
> -  EFI_DEVICE_PATH_PROTOCOL          *FileSysPath;
> -  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevPathToText;
> -  CHAR16                            *UsbPathTxt;
> -  CHAR16                            *FileSysPathTxt;
> -  UINT16                            Result;
> -
> -  Status = gBS->LocateProtocol (&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **) &DevPathToText);
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((DEBUG_ERROR, "Locate DevicePathToTextPro %r\n", Status));
> -    return BBS_TYPE_UNKNOWN;
> -  }
> -
> -  Result = BBS_TYPE_UNKNOWN;
> -  UsbPathTxt = DevPathToText->ConvertDevicePathToText (UsbPath, TRUE, TRUE);
> -  if (UsbPathTxt == NULL) {
> -    return Result;
> -  }
> -
> -  Status = gBS->LocateHandleBuffer (
> -                  ByProtocol,
> -                  &gEfiSimpleFileSystemProtocolGuid,
> -                  NULL,
> -                  &NumberFileSystemHandles,
> -                  &FileSystemHandles
> -                  );
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((DEBUG_ERROR, "Locate SimpleFileSystemProtocol error(%r)\n", Status));
> -    FreePool (UsbPathTxt);
> -    return BBS_TYPE_UNKNOWN;
> -  }
> -
> -  for (Index = 0; Index < NumberFileSystemHandles; Index++) {
> -    FileSysPath = DevicePathFromHandle (FileSystemHandles[Index]);
> -    FileSysPathTxt = DevPathToText->ConvertDevicePathToText (FileSysPath, TRUE, TRUE);
> -
> -    if (FileSysPathTxt == NULL) {
> -      continue;
> -    }
> -
> -    Result = GetBBSTypeFromFileSysPath (UsbPathTxt, FileSysPathTxt, FileSysPath);
> -    FreePool (FileSysPathTxt);
> -
> -    if (Result != BBS_TYPE_UNKNOWN) {
> -      break;
> -    }
> -  }
> -
> -  if (NumberFileSystemHandles != 0) {
> -    FreePool (FileSystemHandles);
> -  }
> -
> -  FreePool (UsbPathTxt);
> -
> -  return Result;
> -}
> -
> -STATIC
> -UINT16
> -GetBBSTypeFromMessagingDevicePath (
> -  IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,
> -  IN EFI_DEVICE_PATH_PROTOCOL *Node
> -  )
> -{
> -  VENDOR_DEVICE_PATH       *Vendor;
> -  UINT16                   Result;
> -
> -  Result = BBS_TYPE_UNKNOWN;
> -
> -  switch (DevicePathSubType (Node)) {
> -  case MSG_MAC_ADDR_DP:
> -    Result = BBS_TYPE_EMBEDDED_NETWORK;
> -    break;
> -
> -  case MSG_USB_DP:
> -    Result = GetBBSTypeFromUsbPath (DevicePath);
> -    if (Result == BBS_TYPE_UNKNOWN) {
> -      Result =  BBS_TYPE_USB;
> -    }
> -    break;
> -
> -  case MSG_SATA_DP:
> -    Result = BBS_TYPE_HARDDRIVE;
> -    break;
> -
> -  case MSG_VENDOR_DP:
> -    Vendor = (VENDOR_DEVICE_PATH *) (Node);
> -    if ((&Vendor->Guid) != NULL) {
> -      if (CompareGuid (&Vendor->Guid, &((EFI_GUID) DEVICE_PATH_MESSAGING_SAS))) {
> -        Result = BBS_TYPE_HARDDRIVE;
> -      }
> -    }
> -    break;
> -
> -  default:
> -    Result = BBS_TYPE_UNKNOWN;
> -    break;
> -  }
> -
> -  return Result;
> -}
> -
> -STATIC
> -UINT16
> -GetBBSTypeByDevicePath (
> -  IN EFI_DEVICE_PATH_PROTOCOL *DevicePath
> -  )
> -{
> -  EFI_DEVICE_PATH_PROTOCOL *Node;
> -  UINT16                   Result;
> -
> -  Result = BBS_TYPE_UNKNOWN;
> -  if (DevicePath == NULL) {
> -    return Result;
> -  }
> -
> -  Node = DevicePath;
> -  while (!IsDevicePathEnd (Node)) {
> -    switch (DevicePathType (Node)) {
> -    case MEDIA_DEVICE_PATH:
> -      if (DevicePathSubType (Node) == MEDIA_CDROM_DP) {
> -        Result = BBS_TYPE_CDROM;
> -      }
> -      break;
> -
> -    case MESSAGING_DEVICE_PATH:
> -      Result = GetBBSTypeFromMessagingDevicePath (DevicePath, Node);
> -      break;
> -
> -    default:
> -      Result = BBS_TYPE_UNKNOWN;
> -      break;
> -    }
> -
> -    if (Result != BBS_TYPE_UNKNOWN) {
> -      break;
> -    }
> -
> -    Node = NextDevicePathNode (Node);
> -  }
> -
> -  return Result;
> -}
> -
> -STATIC
> -EFI_STATUS
> -GetBmcBootOptionsSetting (
> -  OUT IPMI_GET_BOOT_OPTION *BmcBootOpt
> -  )
> -{
> -  EFI_STATUS   Status;
> -
> -  Status = IpmiCmdGetSysBootOptions (BmcBootOpt);
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((DEBUG_ERROR, "Get iBMC BootOpts %r!\n", Status));
> -    return Status;
> -  }
> -
> -  if (BmcBootOpt->BootFlagsValid != BOOT_OPTION_BOOT_FLAG_VALID) {
> -    return EFI_NOT_FOUND;
> -  }
> -
> -  if (BmcBootOpt->Persistent) {
> -    BmcBootOpt->BootFlagsValid = BOOT_OPTION_BOOT_FLAG_VALID;
> -  } else {
> -    BmcBootOpt->BootFlagsValid = BOOT_OPTION_BOOT_FLAG_INVALID;
> -  }
> -
> -  Status = IpmiCmdSetSysBootOptions (BmcBootOpt);
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((DEBUG_ERROR, "Set iBMC BootOpts %r!\n", Status));
> -  }
> -
> -  return Status;
> -}
> -
> -STATIC
> -VOID
> -RestoreBootOrder (
> -  VOID
> -  )
> -{
> -  EFI_STATUS                Status;
> -  UINT16                    *BootOrder;
> -  UINTN                     BootOrderSize;
> -
> -  GetVariable2 (L"BootOrderBackup", &gOemBootVaraibleGuid, (VOID **) &BootOrder, &BootOrderSize);
> -  if (BootOrder == NULL) {
> -    return ;
> -  }
> -
> -  Print (L"Restore BootOrder(%d).\n", BootOrderSize / sizeof (UINT16));
> -
> -  Status = gRT->SetVariable (
> -                  L"BootOrder",
> -                  &gEfiGlobalVariableGuid,
> -                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
> -                  BootOrderSize,
> -                  BootOrder
> -                  );
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((DEBUG_ERROR, "SetVariable BootOrder %r!\n", Status));
> -  }
> -
> -  Status = gRT->SetVariable (
> -                  L"BootOrderBackup",
> -                  &gOemBootVaraibleGuid,
> -                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
> -                  0,
> -                  NULL
> -                  );
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((DEBUG_ERROR, "SetVariable BootOrderBackup %r!\n", Status));
> -  }
> -
> -  FreePool (BootOrder);
> -
> -  return;
> -}
> -
> -
> -VOID
> -RestoreBootOrderOnReadyToBoot (
> -  IN EFI_EVENT        Event,
> -  IN VOID             *Context
> -  )
> -{
> -  // restore BootOrder variable in normal condition.
> -  RestoreBootOrder ();
> -}
> -
> -STATIC
> -VOID
> -UpdateBootOrder (
> -  IN UINT16  *NewOrder,
> -  IN UINT16  *BootOrder,
> -  IN UINTN   BootOrderSize
> -  )
> -{
> -  EFI_STATUS  Status;
> -  EFI_EVENT   Event;
> -
> -  Status = gRT->SetVariable (
> -                  L"BootOrderBackup",
> -                  &gOemBootVaraibleGuid,
> -                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
> -                  BootOrderSize,
> -                  BootOrder
> -                  );
> -  if (EFI_ERROR (Status)) {
> -    return;
> -  }
> -
> -  Status = gRT->SetVariable (
> -                  L"BootOrder",
> -                  &gEfiGlobalVariableGuid,
> -                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
> -                  BootOrderSize,
> -                  NewOrder
> -                  );
> -  if (EFI_ERROR (Status)) {
> -    return;
> -  }
> -
> -  // Register notify function to restore BootOrder variable on ReadyToBoot Event.
> -  Status = gBS->CreateEventEx (
> -                  EVT_NOTIFY_SIGNAL,
> -                  TPL_CALLBACK,
> -                  RestoreBootOrderOnReadyToBoot,
> -                  NULL,
> -                  &gEfiEventReadyToBootGuid,
> -                  &Event
> -                  );
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((DEBUG_ERROR, "Create ready to boot event %r!\n", Status));
> -  }
> -
> -  return;
> -}
> -
> -STATIC
> -VOID
> -SetBootOrder (
> -  IN UINT16 BootType
> -  )
> -{
> -  UINT16                       *NewOrder;
> -  UINT16                       *RemainBoots;
> -  UINT16                       *BootOrder;
> -  UINTN                        BootOrderSize;
> -  CHAR16                       OptionName[sizeof ("Boot####")];
> -  UINTN                        Index;
> -  LIST_ENTRY                   BootOptionList;
> -  BDS_COMMON_OPTION            *Option;
> -  UINTN                        SelectCnt;
> -  UINTN                        RemainCnt;
> -
> -  InitializeListHead (&BootOptionList);
> -
> -  GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrder, &BootOrderSize);
> -  if (BootOrder == NULL) {
> -    return ;
> -  }
> -
> -  NewOrder = AllocatePool (BootOrderSize);
> -  RemainBoots = AllocatePool (BootOrderSize);
> -  if ((NewOrder == NULL) || (RemainBoots == NULL)) {
> -    DEBUG ((DEBUG_ERROR, "Out of resources."));
> -    goto Exit;
> -  }
> -
> -  SelectCnt = 0;
> -  RemainCnt = 0;
> -
> -  for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {
> -    UnicodeSPrint (OptionName, sizeof (OptionName), L"Boot%04x", BootOrder[Index]);
> -    Option = BdsLibVariableToOption (&BootOptionList, OptionName);
> -    if (Option == NULL) {
> -      DEBUG ((DEBUG_ERROR, "Boot%04x is invalid option!\n", BootOrder[Index]));
> -      continue;
> -    }
> -
> -    if (GetBBSTypeByDevicePath (Option->DevicePath) == BootType) {
> -      NewOrder[SelectCnt++] = BootOrder[Index];
> -    } else {
> -      RemainBoots[RemainCnt++] = BootOrder[Index];
> -    }
> -  }
> -
> -  if (SelectCnt != 0) {
> -    // append RemainBoots to NewOrder
> -    for (Index = 0; Index < RemainCnt; Index++) {
> -      NewOrder[SelectCnt + Index] = RemainBoots[Index];
> -    }
> -
> -    if (CompareMem (NewOrder, BootOrder, BootOrderSize) != 0) {
> -      UpdateBootOrder (NewOrder, BootOrder, BootOrderSize);
> -    }
> -  }
> -
> -Exit:
> -  FreePool (BootOrder);
> -  if (NewOrder != NULL) {
> -    FreePool (NewOrder);
> -  }
> -  if (RemainBoots != NULL) {
> -    FreePool (RemainBoots);
> -  }
> -
> -  return ;
> -}
> -
> -STATIC
> -VOID
> -HandleBmcBootType (
> -  VOID
> -  )
> -{
> -  EFI_STATUS                Status;
> -  IPMI_GET_BOOT_OPTION      BmcBootOpt;
> -  UINT16                    BootType;
> -
> -  Status = GetBmcBootOptionsSetting (&BmcBootOpt);
> -  if (EFI_ERROR (Status)) {
> -    return;
> -  }
> -
> -  Print (L"Boot Type from BMC is %x\n", BmcBootOpt.BootDeviceSelector);
> -
> -  switch (BmcBootOpt.BootDeviceSelector) {
> -  case ForcePxe:
> -    BootType = BBS_TYPE_EMBEDDED_NETWORK;
> -    break;
> -
> -  case ForcePrimaryRemovableMedia:
> -    BootType = BBS_TYPE_USB;
> -    break;
> -
> -  case ForceDefaultHardDisk:
> -    BootType = BBS_TYPE_HARDDRIVE;
> -    break;
> -
> -  case ForceDefaultCD:
> -    BootType = BBS_TYPE_CDROM;
> -    break;
> -
> -  default:
> -    return;
> -  }
> -
> -  SetBootOrder (BootType);
> -}
> -
> -//
> -// BDS Platform Functions
> -//
> -/**
> -  Platform Bds init. Include the platform firmware vendor, revision
> -  and so crc check.
> -
> -**/
> -VOID
> -EFIAPI
> -PlatformBdsInit (
> -  VOID
> -  )
> -{
> -  //Signal EndofDxe Event
> -  EfiEventGroupSignal(&gEfiEndOfDxeEventGroupGuid);
> -
> -  // restore BootOrder variable if previous BMC boot override attempt
> -  // left it in a modified state
> -  RestoreBootOrder ();
> -}
> -
> -
> -/**
> -  Check if the handle satisfies a particular condition.
> -
> -  @param[in] Handle      The handle to check.
> -  @param[in] ReportText  A caller-allocated string passed in for reporting
> -                         purposes. It must never be NULL.
> -
> -  @retval TRUE   The condition is satisfied.
> -  @retval FALSE  Otherwise. This includes the case when the condition could not
> -                 be fully evaluated due to an error.
> -**/
> -typedef
> -BOOLEAN
> -(EFIAPI *FILTER_FUNCTION) (
> -  IN EFI_HANDLE   Handle,
> -  IN CONST CHAR16 *ReportText
> -  );
> -
> -
> -/**
> -  Process a handle.
> -
> -  @param[in] Handle      The handle to process.
> -  @param[in] ReportText  A caller-allocated string passed in for reporting
> -                         purposes. It must never be NULL.
> -**/
> -typedef
> -VOID
> -(EFIAPI *CALLBACK_FUNCTION)  (
> -  IN EFI_HANDLE   Handle,
> -  IN CONST CHAR16 *ReportText
> -  );
> -
> -/**
> -  Locate all handles that carry the specified protocol, filter them with a
> -  callback function, and pass each handle that passes the filter to another
> -  callback.
> -
> -  @param[in] ProtocolGuid  The protocol to look for.
> -
> -  @param[in] Filter        The filter function to pass each handle to. If this
> -                           parameter is NULL, then all handles are processed.
> -
> -  @param[in] Process       The callback function to pass each handle to that
> -                           clears the filter.
> -**/
> -STATIC
> -VOID
> -FilterAndProcess (
> -  IN EFI_GUID          *ProtocolGuid,
> -  IN FILTER_FUNCTION   Filter         OPTIONAL,
> -  IN CALLBACK_FUNCTION Process
> -  )
> -{
> -  EFI_STATUS Status;
> -  EFI_HANDLE *Handles;
> -  UINTN      NoHandles;
> -  UINTN      Idx;
> -
> -  Status = gBS->LocateHandleBuffer (ByProtocol, ProtocolGuid,
> -                  NULL /* SearchKey */, &NoHandles, &Handles);
> -  if (EFI_ERROR (Status)) {
> -    //
> -    // This is not an error, just an informative condition.
> -    //
> -    DEBUG ((EFI_D_VERBOSE, "%a: %g: %r\n", __FUNCTION__, ProtocolGuid,
> -      Status));
> -    return;
> -  }
> -
> -  ASSERT (NoHandles > 0);
> -  for (Idx = 0; Idx < NoHandles; ++Idx) {
> -    CHAR16        *DevicePathText;
> -    STATIC CHAR16 Fallback[] = L"<device path unavailable>";
> -
> -    //
> -    // The ConvertDevicePathToText() function handles NULL input transparently.
> -    //
> -    DevicePathText = ConvertDevicePathToText (
> -                       DevicePathFromHandle (Handles[Idx]),
> -                       FALSE, // DisplayOnly
> -                       FALSE  // AllowShortcuts
> -                       );
> -    if (DevicePathText == NULL) {
> -      DevicePathText = Fallback;
> -    }
> -
> -    if (Filter == NULL || Filter (Handles[Idx], DevicePathText)) {
> -      Process (Handles[Idx], DevicePathText);
> -    }
> -
> -    if (DevicePathText != Fallback) {
> -      FreePool (DevicePathText);
> -    }
> -  }
> -  gBS->FreePool (Handles);
> -}
> -
> -
> -/**
> -  This FILTER_FUNCTION checks if a handle corresponds to a PCI display device.
> -**/
> -STATIC
> -BOOLEAN
> -EFIAPI
> -IsPciDisplay (
> -  IN EFI_HANDLE   Handle,
> -  IN CONST CHAR16 *ReportText
> -  )
> -{
> -  EFI_STATUS          Status;
> -  EFI_PCI_IO_PROTOCOL *PciIo;
> -  PCI_TYPE00          Pci;
> -
> -  Status = gBS->HandleProtocol (Handle, &gEfiPciIoProtocolGuid,
> -                  (VOID**)&PciIo);
> -  if (EFI_ERROR (Status)) {
> -    //
> -    // This is not an error worth reporting.
> -    //
> -    return FALSE;
> -  }
> -
> -  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0 /* Offset */,
> -                        sizeof Pci / sizeof (UINT32), &Pci);
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((EFI_D_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
> -    return FALSE;
> -  }
> -
> -  return IS_PCI_DISPLAY (&Pci);
> -}
> -
> -
> -/**
> -  This CALLBACK_FUNCTION attempts to connect a handle non-recursively, asking
> -  the matching driver to produce all first-level child handles.
> -**/
> -STATIC
> -VOID
> -EFIAPI
> -Connect (
> -  IN EFI_HANDLE   Handle,
> -  IN CONST CHAR16 *ReportText
> -  )
> -{
> -  EFI_STATUS Status;
> -
> -  Status = gBS->ConnectController (
> -                  Handle, // ControllerHandle
> -                  NULL,   // DriverImageHandle
> -                  NULL,   // RemainingDevicePath -- produce all children
> -                  FALSE   // Recursive
> -                  );
> -  DEBUG ((EFI_ERROR (Status) ? EFI_D_ERROR : EFI_D_VERBOSE, "%a: %s: %r\n",
> -    __FUNCTION__, ReportText, Status));
> -}
> -
> -
> -/**
> -  This CALLBACK_FUNCTION retrieves the EFI_DEVICE_PATH_PROTOCOL from the
> -  handle, and adds it to ConOut and ErrOut.
> -**/
> -STATIC
> -VOID
> -EFIAPI
> -AddOutput (
> -  IN EFI_HANDLE   Handle,
> -  IN CONST CHAR16 *ReportText
> -  )
> -{
> -  EFI_STATUS               Status;
> -  EFI_DEVICE_PATH_PROTOCOL *DevicePath;
> -
> -  DevicePath = DevicePathFromHandle (Handle);
> -  if (DevicePath == NULL) {
> -    DEBUG ((EFI_D_ERROR, "%a: %s: handle %p: device path not found\n",
> -      __FUNCTION__, ReportText, Handle));
> -    return;
> -  }
> -
> -  Status = BdsLibUpdateConsoleVariable (L"ConOut", DevicePath, NULL);
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((EFI_D_ERROR, "%a: %s: adding to ConOut: %r\n", __FUNCTION__,
> -      ReportText, Status));
> -    return;
> -  }
> -
> -  Status = BdsLibUpdateConsoleVariable (L"ErrOut", DevicePath, NULL);
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((EFI_D_ERROR, "%a: %s: adding to ErrOut: %r\n", __FUNCTION__,
> -      ReportText, Status));
> -    return;
> -  }
> -
> -  DEBUG ((EFI_D_VERBOSE, "%a: %s: added to ConOut and ErrOut\n", __FUNCTION__,
> -    ReportText));
> -}
> -
> -
> -/**
> -  The function will execute with as the platform policy, current policy
> -  is driven by boot mode. IBV/OEM can customize this code for their specific
> -  policy action.
> -
> -  @param  DriverOptionList        The header of the driver option link list
> -  @param  BootOptionList          The header of the boot option link list
> -  @param  ProcessCapsules         A pointer to ProcessCapsules()
> -  @param  BaseMemoryTest          A pointer to BaseMemoryTest()
> -
> -**/
> -VOID
> -EFIAPI
> -PlatformBdsPolicyBehavior (
> -  IN LIST_ENTRY                      *DriverOptionList,
> -  IN LIST_ENTRY                      *BootOptionList,
> -  IN PROCESS_CAPSULES                ProcessCapsules,
> -  IN BASEM_MEMORY_TEST               BaseMemoryTest
> -  )
> -{
> -  EFI_STATUS Status;
> -  //
> -  // Locate the PCI root bridges and make the PCI bus driver connect each,
> -  // non-recursively. This will produce a number of child handles with PciIo on
> -  // them.
> -  //
> -  FilterAndProcess (&gEfiPciRootBridgeIoProtocolGuid, NULL, Connect);
> -
> -  //
> -  // Find all display class PCI devices (using the handles from the previous
> -  // step), and connect them non-recursively. This should produce a number of
> -  // child handles with GOPs on them.
> -  //
> -  FilterAndProcess (&gEfiPciIoProtocolGuid, IsPciDisplay, Connect);
> -
> -  //
> -  // Now add the device path of all handles with GOP on them to ConOut and
> -  // ErrOut.
> -  //
> -  FilterAndProcess (&gEfiGraphicsOutputProtocolGuid, NULL, AddOutput);
> -
> -  //
> -  // Add the hardcoded short-form USB keyboard device path to ConIn.
> -  //
> -  BdsLibUpdateConsoleVariable (L"ConIn",
> -    (EFI_DEVICE_PATH_PROTOCOL *)&mUsbKeyboard, NULL);
> -
> -  //
> -  // Add the hardcoded serial console device path to ConIn, ConOut, ErrOut.
> -  //
> -  BdsLibUpdateConsoleVariable (L"ConIn",
> -    (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
> -  BdsLibUpdateConsoleVariable (L"ConOut",
> -    (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
> -  BdsLibUpdateConsoleVariable (L"ErrOut",
> -    (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
> -
> -  //
> -  // Connect the consoles based on the above variables.
> -  //
> -  BdsLibConnectAllDefaultConsoles ();
> -
> -  //
> -  // Show the splash screen.
> -  //
> -  EnableQuietBoot (PcdGetPtr (PcdLogoFile));
> -
> -  //
> -  // Connect the rest of the devices.
> -  //
> -  BdsLibConnectAll ();
> -
> -  //
> -  // Add memory test to convert memory above 4GB to be tested
> -  //
> -  Status = BaseMemoryTest (QUICK);
> -  if (EFI_ERROR (Status)) {
> -    DEBUG ((EFI_D_ERROR, "[%a:%d] - Base memory test failed: %r\n", __FUNCTION__, __LINE__, Status));
> -  }
> -
> -  //
> -  // Process QEMU's -kernel command line option. Note that the kernel booted
> -  // this way should receive ACPI tables, which is why we connect all devices
> -  // first (see above) -- PCI enumeration blocks ACPI table installation, if
> -  // there is a PCI host.
> -  //
> -  //TryRunningQemuKernel ();
> -
> -  BdsLibEnumerateAllBootOption (BootOptionList);
> -
> -  // Add Flash Start OS and ESL Start OS boot option
> -  (VOID) HwBdsLibRegisterAppBootOption (BootOptionList, &gFlashStartOsAppGuid, L"Flash Start OS");
> -  (VOID) HwBdsLibRegisterAppBootOption (BootOptionList, &gEslStartOsAppGuid, L"ESL Start OS");
> -
> -  // Add EBL as boot option
> -  (VOID) HwBdsLibRegisterAppBootOption (BootOptionList, &gEblFileGuid, L"Embedded Boot Loader (EBL)");
> -
> -  // Remove EFI Misc Device Boot Options
> -  BdsDeleteAllInvalidEfiBootOption ();
> -
> -  //SetBootOrderFromQemu (BootOptionList);
> -  //
> -  // The BootOrder variable may have changed, reload the in-memory list with
> -  // it.
> -  //
> -  BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder");
> -
> -  //PlatformBdsEnterFrontPage (GetFrontPageTimeoutFromQemu(), TRUE);
> -  Print (L"Press Enter to boot OS immediately.\n");
> -  Print (L"Press any other key in %d seconds to stop automatical booting...\n", PcdGet16(PcdPlatformBootTimeOut));
> -  PlatformBdsEnterFrontPage (PcdGet16(PcdPlatformBootTimeOut), TRUE);
> -  HandleBmcBootType ();
> -}
> -
> -/**
> -  Hook point after a boot attempt succeeds. We don't expect a boot option to
> -  return, so the UEFI 2.0 specification defines that you will default to an
> -  interactive mode and stop processing the BootOrder list in this case. This
> -  is also a platform implementation and can be customized by IBV/OEM.
> -
> -  @param  Option                  Pointer to Boot Option that succeeded to boot.
> -
> -**/
> -VOID
> -EFIAPI
> -PlatformBdsBootSuccess (
> -  IN  BDS_COMMON_OPTION *Option
> -  )
> -{
> -}
> -
> -/**
> -  Hook point after a boot attempt fails.
> -
> -  @param  Option                  Pointer to Boot Option that failed to boot.
> -  @param  Status                  Status returned from failed boot.
> -  @param  ExitData                Exit data returned from failed boot.
> -  @param  ExitDataSize            Exit data size returned from failed boot.
> -
> -**/
> -VOID
> -EFIAPI
> -PlatformBdsBootFail (
> -  IN  BDS_COMMON_OPTION  *Option,
> -  IN  EFI_STATUS         Status,
> -  IN  CHAR16             *ExitData,
> -  IN  UINTN              ExitDataSize
> -  )
> -{
> -}
> -
> -/**
> -  This function locks platform flash that is not allowed to be updated during normal boot path.
> -  The flash layout is platform specific.
> -**/
> -VOID
> -EFIAPI
> -PlatformBdsLockNonUpdatableFlash (
> -  VOID
> -  )
> -{
> -  return;
> -}
> diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
> deleted file mode 100644
> index 9ea701db11..0000000000
> --- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
> +++ /dev/null
> @@ -1,118 +0,0 @@
> -/** @file
> -*
> -*  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.
> -*
> -**/
> -
> -#include "IntelBdsPlatform.h"
> -#include <Library/UefiLib.h>
> -#include <Library/GenericBdsLib.h>
> -#include <Protocol/FirmwareVolume2.h>
> -
> -VOID
> -EFIAPI
> -BdsLibBuildOptionFromApp (
> -  IN EFI_HANDLE                  Handle,
> -  IN OUT LIST_ENTRY              *BdsBootOptionList,
> -  IN GUID                        *FileGuid,
> -  IN CHAR16                      *Description
> -  )
> -{
> -  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;
> -  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH ShellNode;
> -
> -  DevicePath = DevicePathFromHandle (Handle);
> -
> -  //
> -  // Build the shell device path
> -  //
> -  EfiInitializeFwVolDevicepathNode (&ShellNode, FileGuid);
> -
> -  DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);
> -
> -  //
> -  // Create and register the shell boot option
> -  //
> -  BdsLibRegisterNewOption (BdsBootOptionList, DevicePath, Description, L"BootOrder");
> -
> -}
> -EFI_STATUS
> -EFIAPI
> -HwBdsLibRegisterAppBootOption (
> -  IN OUT LIST_ENTRY              *BdsBootOptionList,
> -  IN GUID                        *FileGuid,
> -  IN CHAR16                      *Description
> -  )
> -{
> -  EFI_STATUS                    Status;
> -  UINTN                         Index;
> -  UINTN                         FvHandleCount;
> -  EFI_HANDLE                    *FvHandleBuffer;
> -  EFI_FV_FILETYPE               Type;
> -  UINTN                         Size;
> -  EFI_FV_FILE_ATTRIBUTES        Attributes;
> -  UINT32                        AuthenticationStatus;
> -  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
> -  UINTN                         Count = 0;
> -
> -  //
> -  // Check if we have on flash shell
> -  //
> -  gBS->LocateHandleBuffer (
> -        ByProtocol,
> -        &gEfiFirmwareVolume2ProtocolGuid,
> -        NULL,
> -        &FvHandleCount,
> -        &FvHandleBuffer
> -        );
> -  for (Index = 0; Index < FvHandleCount; Index++) {
> -    gBS->HandleProtocol (
> -          FvHandleBuffer[Index],
> -          &gEfiFirmwareVolume2ProtocolGuid,
> -          (VOID **) &Fv
> -          );
> -
> -    Status = Fv->ReadFile (
> -                  Fv,
> -                  FileGuid,
> -                  NULL,
> -                  &Size,
> -                  &Type,
> -                  &Attributes,
> -                  &AuthenticationStatus
> -                  );
> -    if (EFI_ERROR (Status)) {
> -      //
> -      // Skip if no shell file in the FV
> -      //
> -      continue;
> -    }
> -    //
> -    // Build the shell boot option
> -    //
> -    BdsLibBuildOptionFromApp (FvHandleBuffer[Index], BdsBootOptionList,
> -        FileGuid, Description);
> -
> -    Count++;
> -  }
> -
> -  if (FvHandleCount != 0) {
> -    FreePool (FvHandleBuffer);
> -  }
> -
> -  if (Count == 0) {
> -    return EFI_NOT_FOUND;
> -  }
> -
> -  return EFI_SUCCESS;
> -}
> -
> --
> 2.12.0.windows.1
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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 {
>      <LibraryClasses>
> -      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>    }
>
>    #
> --
> 2.12.0.windows.1
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

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
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:08, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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 {
>      <LibraryClasses>
> -      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> +      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>    }
>
>    #
> --
> 2.12.0.windows.1
>

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

[Ard Biesheuvel]

On Tue, 14 May 2019 at 04:09, Hao A Wu <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Hao A Wu <hao.a.wu@intel.com>

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
>

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

[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 <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> 
> 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
> >
> >
> > 
> >

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

[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 <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> 
> 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
> >

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

[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 <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> 
> 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
> >

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

[Ard Biesheuvel]

On Fri, 17 May 2019 at 18:03, Leif Lindholm <leif.lindholm@linaro.org> 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 <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> > > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> >
> > 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)

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

[Ard Biesheuvel]

(adding Andrew)

On Fri, 17 May 2019 at 18:05, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> On Fri, 17 May 2019 at 18:03, Leif Lindholm <leif.lindholm@linaro.org> 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 <hao.a.wu@intel.com> 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 <ard.biesheuvel@linaro.org>
> > > > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> > >
> > > 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.

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

[Wu, Hao A]

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Ard
> Biesheuvel
> Sent: Friday, May 17, 2019 11:34 PM
> To: Leif Lindholm
> Cc: Wu, Hao A; edk2-devel-groups-io; Kinney, Michael D
> Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 06/16] Hisilicon/D0x: Use
> StatusCode Router & Handler in MdeModulePkg
> 
> On Wed, 15 May 2019 at 21:47, Leif Lindholm <leif.lindholm@linaro.org>
> 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.

Hello Ard and Leif,

Do you know who might be able to help on testing this patch?

Best Regards,
Hao Wu

> 
> >
> > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> > > ---
> > >  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/ReportStatusCodeRout
> erPei.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/StatusCodeRunti
> meDxe.inf
> > > +
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatus
> CodeRouterRuntimeDxe.inf
> > > +
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler
> RuntimeDxe.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/ReportStatusCodeRout
> erPei.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/StatusCodeRunti
> meDxe.inf
> > > +
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatus
> CodeRouterRuntimeDxe.inf
> > > +
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler
> RuntimeDxe.inf
> > >    #
> > >    #ACPI
> > >    #
> > > diff --git a/Platform/Hisilicon/D06/D06.dsc
> b/Platform/Hisilicon/D06/D06.dsc
> > > index c1cd13b6c7..0c12181a38 100644
> > > --- a/Platform/Hisilicon/D06/D06.dsc
> > > +++ b/Platform/Hisilicon/D06/D06.dsc
> > > @@ -255,7 +255,8 @@
> > >    ArmPlatformPkg/PlatformPei/PlatformPeim.inf
> > >
> > >    ArmPkg/Drivers/CpuPei/CpuPei.inf
> > > -  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > +
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRout
> erPei.inf
> > > +
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> > >
> MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
> > >    MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
> > >
> > > @@ -317,7 +318,8 @@
> > >    ArmPkg/Drivers/TimerDxe/TimerDxe.inf
> > >
> > >    MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
> > > -
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRunti
> meDxe.inf
> > > +
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatus
> CodeRouterRuntimeDxe.inf
> > > +
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler
> RuntimeDxe.inf
> > >    #
> > >    #ACPI
> > >    #
> > > diff --git a/Platform/Hisilicon/D03/D03.fdf
> b/Platform/Hisilicon/D03/D03.fdf
> > > index 3f07b2e577..f7024f400d 100644
> > > --- a/Platform/Hisilicon/D03/D03.fdf
> > > +++ b/Platform/Hisilicon/D03/D03.fdf
> > > @@ -199,7 +199,8 @@ READ_LOCK_STATUS   = TRUE
> > >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> > >    INF FatPkg/EnhancedFatDxe/Fat.inf
> > >    INF
> MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > > -  INF
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRunti
> meDxe.inf
> > > +  INF
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatus
> CodeRouterRuntimeDxe.inf
> > > +  INF
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler
> RuntimeDxe.inf
> > >
> > >    #
> > >    # Usb Support
> > > @@ -329,7 +330,8 @@ READ_LOCK_STATUS   = TRUE
> > >    INF Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf
> > >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> > >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > > -  INF
> IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > +  INF
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRout
> erPei.inf
> > > +  INF
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> > >    INF Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> > >
> > >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > > diff --git a/Platform/Hisilicon/D05/D05.fdf
> b/Platform/Hisilicon/D05/D05.fdf
> > > index 9632aea4b0..76c04b2740 100644
> > > --- a/Platform/Hisilicon/D05/D05.fdf
> > > +++ b/Platform/Hisilicon/D05/D05.fdf
> > > @@ -203,7 +203,8 @@ READ_LOCK_STATUS   = TRUE
> > >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> > >    INF FatPkg/EnhancedFatDxe/Fat.inf
> > >    INF
> MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > > -  INF
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRunti
> meDxe.inf
> > > +  INF
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatus
> CodeRouterRuntimeDxe.inf
> > > +  INF
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler
> RuntimeDxe.inf
> > >
> > >    #
> > >    # Usb Support
> > > @@ -351,7 +352,8 @@ READ_LOCK_STATUS   = TRUE
> > >    INF Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf
> > >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> > >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > > -  INF
> IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > +  INF
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRout
> erPei.inf
> > > +  INF
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> > >    INF Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> > >
> > >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > > diff --git a/Platform/Hisilicon/D06/D06.fdf
> b/Platform/Hisilicon/D06/D06.fdf
> > > index e402628a1b..fb26881300 100644
> > > --- a/Platform/Hisilicon/D06/D06.fdf
> > > +++ b/Platform/Hisilicon/D06/D06.fdf
> > > @@ -204,7 +204,8 @@ READ_LOCK_STATUS   = TRUE
> > >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> > >    INF FatPkg/EnhancedFatDxe/Fat.inf
> > >    INF
> MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > > -  INF
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRunti
> meDxe.inf
> > > +  INF
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatus
> CodeRouterRuntimeDxe.inf
> > > +  INF
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler
> RuntimeDxe.inf
> > >
> > >    #
> > >    # Usb Support
> > > @@ -345,7 +346,8 @@ READ_LOCK_STATUS   = TRUE
> > >    INF Platform/Hisilicon/D06/MemoryInitPei/MemoryInitPeim.inf
> > >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> > >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > > -  INF
> IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > +  INF
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRout
> erPei.inf
> > > +  INF
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
> > >    INF Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> > >
> > >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > > --
> > > 2.12.0.windows.1
> > >
> 
> 

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

[Ni, Ray]

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Hao
> A
> Sent: Monday, May 20, 2019 4:50 PM
> To: devel@edk2.groups.io; ard.biesheuvel@linaro.org; Leif Lindholm
> <leif.lindholm@linaro.org>
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 06/16] Hisilicon/D0x:
> Use StatusCode Router & Handler in MdeModulePkg
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Ard
> > Biesheuvel
> > Sent: Friday, May 17, 2019 11:34 PM
> > To: Leif Lindholm
> > Cc: Wu, Hao A; edk2-devel-groups-io; Kinney, Michael D
> > Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 06/16] Hisilicon/D0x:
> Use
> > StatusCode Router & Handler in MdeModulePkg
> >
> > On Wed, 15 May 2019 at 21:47, Leif Lindholm <leif.lindholm@linaro.org>
> > 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.
> 
> Hello Ard and Leif,
> 
> Do you know who might be able to help on testing this patch?

All,
We don't expect the no-one-own-testing blocks this patch series commit.
If we haven't received test result by start of next week, we would like
have an exception to push the patch series.

If we receive test results before that, we will continue working with
community to refine the patch to pass the test. (I think the possibility
of test failure is quite low. Similar changes have already been made
to OvmfPkg back to year 2016.)

Thanks,
Ray


> 
> Best Regards,
> Hao Wu
> 
> >
> > >
> > > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > > Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
> > > > ---
> > > >  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/ReportStatusCode
> Rout
> > erPei.inf
> > > > +
> >
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.in
> f
> > > >
> >
> 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/StatusCode
> Runti
> > meDxe.inf
> > > > +
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSt
> atus
> > CodeRouterRuntimeDxe.inf
> > > > +
> >
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dler
> > RuntimeDxe.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/ReportStatusCode
> Rout
> > erPei.inf
> > > > +
> >
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.in
> f
> > > >
> >
> 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/StatusCode
> Runti
> > meDxe.inf
> > > > +
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSt
> atus
> > CodeRouterRuntimeDxe.inf
> > > > +
> >
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dler
> > RuntimeDxe.inf
> > > >    #
> > > >    #ACPI
> > > >    #
> > > > diff --git a/Platform/Hisilicon/D06/D06.dsc
> > b/Platform/Hisilicon/D06/D06.dsc
> > > > index c1cd13b6c7..0c12181a38 100644
> > > > --- a/Platform/Hisilicon/D06/D06.dsc
> > > > +++ b/Platform/Hisilicon/D06/D06.dsc
> > > > @@ -255,7 +255,8 @@
> > > >    ArmPlatformPkg/PlatformPei/PlatformPeim.inf
> > > >
> > > >    ArmPkg/Drivers/CpuPei/CpuPei.inf
> > > > -
> IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > > +
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCode
> Rout
> > erPei.inf
> > > > +
> >
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.in
> f
> > > >
> >
> MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
> > > >    MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
> > > >
> > > > @@ -317,7 +318,8 @@
> > > >    ArmPkg/Drivers/TimerDxe/TimerDxe.inf
> > > >
> > > >    MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
> > > > -
> >
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode
> Runti
> > meDxe.inf
> > > > +
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSt
> atus
> > CodeRouterRuntimeDxe.inf
> > > > +
> >
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dler
> > RuntimeDxe.inf
> > > >    #
> > > >    #ACPI
> > > >    #
> > > > diff --git a/Platform/Hisilicon/D03/D03.fdf
> > b/Platform/Hisilicon/D03/D03.fdf
> > > > index 3f07b2e577..f7024f400d 100644
> > > > --- a/Platform/Hisilicon/D03/D03.fdf
> > > > +++ b/Platform/Hisilicon/D03/D03.fdf
> > > > @@ -199,7 +199,8 @@ READ_LOCK_STATUS   = TRUE
> > > >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> > > >    INF FatPkg/EnhancedFatDxe/Fat.inf
> > > >    INF
> >
> MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > > > -  INF
> >
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode
> Runti
> > meDxe.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSt
> atus
> > CodeRouterRuntimeDxe.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dler
> > RuntimeDxe.inf
> > > >
> > > >    #
> > > >    # Usb Support
> > > > @@ -329,7 +330,8 @@ READ_LOCK_STATUS   = TRUE
> > > >    INF Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf
> > > >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> > > >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > > > -  INF
> > IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCode
> Rout
> > erPei.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.in
> f
> > > >    INF Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> > > >
> > > >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > > > diff --git a/Platform/Hisilicon/D05/D05.fdf
> > b/Platform/Hisilicon/D05/D05.fdf
> > > > index 9632aea4b0..76c04b2740 100644
> > > > --- a/Platform/Hisilicon/D05/D05.fdf
> > > > +++ b/Platform/Hisilicon/D05/D05.fdf
> > > > @@ -203,7 +203,8 @@ READ_LOCK_STATUS   = TRUE
> > > >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> > > >    INF FatPkg/EnhancedFatDxe/Fat.inf
> > > >    INF
> >
> MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > > > -  INF
> >
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode
> Runti
> > meDxe.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSt
> atus
> > CodeRouterRuntimeDxe.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dler
> > RuntimeDxe.inf
> > > >
> > > >    #
> > > >    # Usb Support
> > > > @@ -351,7 +352,8 @@ READ_LOCK_STATUS   = TRUE
> > > >    INF Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf
> > > >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> > > >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > > > -  INF
> > IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCode
> Rout
> > erPei.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.in
> f
> > > >    INF Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> > > >
> > > >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > > > diff --git a/Platform/Hisilicon/D06/D06.fdf
> > b/Platform/Hisilicon/D06/D06.fdf
> > > > index e402628a1b..fb26881300 100644
> > > > --- a/Platform/Hisilicon/D06/D06.fdf
> > > > +++ b/Platform/Hisilicon/D06/D06.fdf
> > > > @@ -204,7 +204,8 @@ READ_LOCK_STATUS   = TRUE
> > > >    INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
> > > >    INF FatPkg/EnhancedFatDxe/Fat.inf
> > > >    INF
> >
> MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> > > > -  INF
> >
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode
> Runti
> > meDxe.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportSt
> atus
> > CodeRouterRuntimeDxe.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dler
> > RuntimeDxe.inf
> > > >
> > > >    #
> > > >    # Usb Support
> > > > @@ -345,7 +346,8 @@ READ_LOCK_STATUS   = TRUE
> > > >    INF Platform/Hisilicon/D06/MemoryInitPei/MemoryInitPeim.inf
> > > >    INF ArmPkg/Drivers/CpuPei/CpuPei.inf
> > > >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
> > > > -  INF
> > IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCode
> Rout
> > erPei.inf
> > > > +  INF
> >
> MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.in
> f
> > > >    INF Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> > > >
> > > >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
> > > > --
> > > > 2.12.0.windows.1
> > > >
> >
> >
> 
> 
> 

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

[ming.huang]

[-- Attachment #1: Type: text/plain, Size: 76 bytes --]

I have tested this patch simply, it can boot to OS sucessfully.

Thanks.

[-- Attachment #2: Type: text/html, Size: 84 bytes --]