Update BdsDxe to fill int he FirmwareVendor and FirmwareRevision fields of the EFI...

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index 0c872128216c1795d9d19e840b71931be6c22f48..2bd1bfb997d19b96b1824a44b86f54a48a3043cd 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -169,6 +169,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index 322cb59f99aa88255ffa8c5c84a5d68e8b2237ef..055a52df1b887a254c5c69253276d1d298bef8dc 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -278,6 +278,7 @@ BdsEntry (
   LIST_ENTRY                      DriverOptionList;\r
   LIST_ENTRY                      BootOptionList;\r
   UINTN                           BootNextSize;\r
+  CHAR16                          *FirmwareVendor;\r
 \r
   //\r
   // Insert the performance probe\r
@@ -296,6 +297,19 @@ BdsEntry (
   //\r
   InitializeHotkeyService ();\r
 \r
+  //\r
+  // Fill in FirmwareVendor and FirmwareRevision from PCDs\r
+  //\r
+  FirmwareVendor = (CHAR16 *)PcdGetPtr (PcdFirmwareVendor);\r
+  gST->FirmwareVendor = AllocateRuntimeCopyPool (StrSize (FirmwareVendor), FirmwareVendor);\r
+  ASSERT (gST->FirmwareVendor != NULL);\r
+  gST->FirmwareRevision = PcdGet32 (PcdFirmwareRevision);\r
+\r
+  //\r
+  // Fixup Tasble CRC after we updated Firmware Vendor and Revision\r
+  //\r
+  gBS->CalculateCrc32 ((VOID *)gST, sizeof(EFI_SYSTEM_TABLE), &gST->Hdr.CRC32);\r
+\r
   //\r
   // Do the platform init, can be customized by OEM/IBV\r
   //\r