1. rolled back Hob library to remove new API - BuildCapsuleHob() and related implemen...

2. implemented BuildCvHob() in PeiHobLib/HobLib.c.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9389 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Library/HobLib.h b/MdePkg/Include/Library/HobLib.h
index dcb4080d48b71890e21adfe10b37826358c6a488..d17de0b35ef4695ccf2dc50a94da4a3f677560fd 100644 (file)
--- a/MdePkg/Include/Library/HobLib.h
+++ b/MdePkg/Include/Library/HobLib.h
@@ -415,25 +415,6 @@ BuildMemoryAllocationHob (
   IN EFI_MEMORY_TYPE             MemoryType\r
   );\r
 \r
-/**\r
-  Builds an UEFI Capsule HOB.\r
-\r
-  This function builds an UEFI Capsule HOB.\r
-  It can only be invoked during PEI phase;\r
-  for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
-  If there is no additional space for HOB creation, then ASSERT().\r
-\r
-  @param  BaseAddress   The physical memory-mapped base address of an UEFI capsule.\r
-  @param  Length        The length of the contiguous memory in bytes.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-BuildCapsuleHob (\r
-  IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
-  IN UINT64                      Length\r
-  );\r
-\r
 /**\r
   Returns the type of a HOB.\r
 \r

diff --git a/MdePkg/Library/DxeHobLib/HobLib.c b/MdePkg/Library/DxeHobLib/HobLib.c
index 9de92ef3bec8664da24e5a37fe1420cda6c15797..61a8fba9a22a4422b18ce889726b446ea23d5fa7 100644 (file)
--- a/MdePkg/Library/DxeHobLib/HobLib.c
+++ b/MdePkg/Library/DxeHobLib/HobLib.c
@@ -562,28 +562,3 @@ BuildMemoryAllocationHob (
   //\r
   ASSERT (FALSE);\r
 }\r
-\r
-/**\r
-  Builds an UEFI Capsule HOB.\r
-\r
-  This function builds an UEFI Capsule HOB.\r
-  It can only be invoked during PEI phase;\r
-  for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
-  If there is no additional space for HOB creation, then ASSERT().\r
-\r
-  @param  BaseAddress   The physical memory-mapped base address of an UEFI capsule.\r
-  @param  Length        The length of the contiguous memory in bytes.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-BuildCapsuleHob (\r
-  IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
-  IN UINT64                      Length\r
-  )\r
-{\r
-  //\r
-  // PEI HOB is read only for DXE phase\r
-  //\r
-  ASSERT (FALSE);\r
-}\r

diff --git a/MdePkg/Library/PeiHobLib/HobLib.c b/MdePkg/Library/PeiHobLib/HobLib.c
index f0cc665085bc46dc5a4b4143a0e6e7b3e67148b4..1815ddf530ff429ac7aeb209023109ab312a3192 100644 (file)
--- a/MdePkg/Library/PeiHobLib/HobLib.c
+++ b/MdePkg/Library/PeiHobLib/HobLib.c
@@ -489,7 +489,12 @@ BuildCvHob (
   IN UINT64                      Length\r
   )\r
 {\r
-  ASSERT (FALSE);\r
+  EFI_HOB_UEFI_CAPSULE  *Hob;\r
+\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_UEFI_CAPSULE, sizeof (EFI_HOB_UEFI_CAPSULE));\r
+\r
+  Hob->BaseAddress  = BaseAddress;\r
+  Hob->Length       = Length;\r
 }\r
 \r
 /**\r
@@ -641,30 +646,3 @@ BuildMemoryAllocationHob (
   //\r
   ZeroMem (Hob->AllocDescriptor.Reserved, sizeof (Hob->AllocDescriptor.Reserved));\r
 }\r
-\r
-/**\r
-  Builds an UEFI Capsule HOB.\r
-\r
-  This function builds an UEFI Capsule HOB.\r
-  It can only be invoked during PEI phase;\r
-  for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
-  If there is no additional space for HOB creation, then ASSERT().\r
-\r
-  @param  BaseAddress   The physical memory-mapped base address of an UEFI capsule.\r
-  @param  Length        The length of the contiguous memory in bytes.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-BuildCapsuleHob (\r
-  IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
-  IN UINT64                      Length\r
-  )\r
-{\r
-  EFI_HOB_UEFI_CAPSULE  *Hob;\r
-\r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_UEFI_CAPSULE, sizeof (EFI_HOB_UEFI_CAPSULE));\r
-\r
-  Hob->BaseAddress  = BaseAddress;\r
-  Hob->Length       = Length;\r
-}\r