diff options
| author | Gua Guo <gua.guo@intel.com> | 2023-03-24 14:55:13 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-03-27 04:21:28 +0000 |
| commit | 1bfc89414dbc2b4e620e06231ae98d714914fc46 (patch) | |
| tree | 2ad6bf54e188ec55cf729cd0eb81e0731809bc7c /UefiPayloadPkg/UefiPayloadEntry | |
| parent | 69e59545b14739e004d3f0452411e195d2a3c197 (diff) | |
| download | edk2-1bfc89414dbc2b4e620e06231ae98d714914fc46.tar.gz edk2-1bfc89414dbc2b4e620e06231ae98d714914fc46.tar.bz2 edk2-1bfc89414dbc2b4e620e06231ae98d714914fc46.zip | |
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>
Diffstat (limited to 'UefiPayloadPkg/UefiPayloadEntry')
| -rw-r--r-- | UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c index 46ee27c905..f8939efe70 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c @@ -422,9 +422,12 @@ BuildHobs ( //
GuidHob = GetFirstGuidHob (&gUniversalPayloadAcpiTableGuid);
if (GuidHob != NULL) {
- AcpiTable = (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GET_GUID_HOB_DATA (GuidHob);
- AcpiBoardInfo = BuildHobFromAcpi ((UINT64)AcpiTable->Rsdp);
- ASSERT (AcpiBoardInfo != NULL);
+ AcpiTable = (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GET_GUID_HOB_DATA (GuidHob);
+ GuidHob = GetFirstGuidHob (&gUefiAcpiBoardInfoGuid);
+ if (GuidHob == NULL) {
+ AcpiBoardInfo = BuildHobFromAcpi ((UINT64)AcpiTable->Rsdp);
+ ASSERT (AcpiBoardInfo != NULL);
+ }
}
//
|