UefiPayloadPkg: Add gUefiAcpiBoardInfoGuid support

if system both exist gUefiAcpiBoardInfoGuid and rsdp,
we may need to use gUefiAcpiBoardInfoGuid as final
config to have backward support.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Reviewed-by: James Lu <james.lu@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
index 46ee27c905e96e3cf61dbcbea80a76b90d8cd789..f8939efe70db0cd13a4ec4cebc6ef9846603719f 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
@@ -422,9 +422,12 @@ BuildHobs (
   //\r
   GuidHob = GetFirstGuidHob (&gUniversalPayloadAcpiTableGuid);\r
   if (GuidHob != NULL) {\r
-    AcpiTable     = (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GET_GUID_HOB_DATA (GuidHob);\r
-    AcpiBoardInfo = BuildHobFromAcpi ((UINT64)AcpiTable->Rsdp);\r
-    ASSERT (AcpiBoardInfo != NULL);\r
+    AcpiTable = (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GET_GUID_HOB_DATA (GuidHob);\r
+    GuidHob   = GetFirstGuidHob (&gUefiAcpiBoardInfoGuid);\r
+    if (GuidHob == NULL) {\r
+      AcpiBoardInfo = BuildHobFromAcpi ((UINT64)AcpiTable->Rsdp);\r
+      ASSERT (AcpiBoardInfo != NULL);\r
+    }\r
   }\r
 \r
   //\r