1 files changed, 3 insertions, 16 deletions
diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index 2dff9024c9..48e12ecc1c 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -421,10 +421,7 @@ Returns:
   UINT32                      HeaderSize;
   UINT32                      TotalSize;
   EFI_DATA_HUB_PROTOCOL       *DataHub;
-  EFI_HII_PROTOCOL            *Hii;
-  EFI_HII_HANDLE              StringHandle;
-  EFI_HII_PACKAGES            *PackageList;
-
+  EFI_HII_HANDLE              HiiHandle;
 
   //
   // Locate DataHub protocol.
@@ -435,14 +432,6 @@ Returns:
   }
 
   //
-  // Locate DataHub protocol.
-  //
-  Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);
-  if (EFI_ERROR (Status)) {
-    return;
-  }
-
-  //
   // Initialize data record header
   //
   mCpuDataRecordHeader.Instance = 1;
@@ -456,10 +445,8 @@ Returns:
   //
   // Initialize strings to HII database
   //
-  PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);
-  Status      = Hii->NewPack (Hii, PackageList, &StringHandle);
-  ASSERT (!EFI_ERROR (Status));
-  FreePool (PackageList);
+  HiiLibAddPackagesToHiiDatabase (1, &gEfiProcessorProducerGuid, NULL, &HiiHandle, CpuStrings);
+  
 
   CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);