summaryrefslogtreecommitdiffstats
path: root/UefiPayloadPkg/Include
diff options
context:
space:
mode:
authorKesavan Balakrishnan, ThiyaguX <thiyagux.kesavan.balakrishnan@intel.com>2021-10-19 23:05:19 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-10-30 15:00:58 +0000
commite7663fdd82a2bf934c51b66f4af3e4479b131923 (patch)
tree3341f54fe66f3f7edc54539abeb66164e0a277ec /UefiPayloadPkg/Include
parent1bc232aae32e812341f10c9b938350cd93308eee (diff)
downloadedk2-e7663fdd82a2bf934c51b66f4af3e4479b131923.tar.gz
edk2-e7663fdd82a2bf934c51b66f4af3e4479b131923.tar.bz2
edk2-e7663fdd82a2bf934c51b66f4af3e4479b131923.zip
UefiPayloadPkg: Remove SystemTableInfo GUID.
SystemTableInfo GUID is not a Spec defined GUID. The latest SBL and CBL produces ACPI and SMBIOS table information. So removing the SystemTableInfo GUID implementation. Cc: Maurice Ma <maurice.ma@intel.com> Cc: Guo Dong <guo.dong@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Benjamin You <benjamin.you@intel.com> Cc: Zhiguang Liu <zhiguang.liu@intel.com> Signed-off-by: Guo Dong <guo.dong@intel.com> Signed-off-by: Thiyagu Kesavan Balakrishnan <thiyagux.kesavan.balakrishnan@intel.com> Reviewed-by: Guo Dong <guo.dong@intel.com>
Diffstat (limited to 'UefiPayloadPkg/Include')
-rw-r--r--UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h26
-rw-r--r--UefiPayloadPkg/Include/Library/BlParseLib.h25
2 files changed, 20 insertions, 31 deletions
diff --git a/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h b/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h
deleted file mode 100644
index e742dd0ca5..0000000000
--- a/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file
- This file defines the hob structure for system tables like ACPI, SMBIOS tables.
-
- Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef SYSTEM_TABLE_INFO_GUID_H_
-#define SYSTEM_TABLE_INFO_GUID_H_
-
-///
-/// System Table Information GUID
-///
-extern EFI_GUID gUefiSystemTableInfoGuid;
-
-typedef struct {
- UINT8 Revision;
- UINT8 Reserved0[3];
- UINT64 AcpiTableBase;
- UINT32 AcpiTableSize;
- UINT64 SmbiosTableBase;
- UINT32 SmbiosTableSize;
-} SYSTEM_TABLE_INFO;
-
-#endif
diff --git a/UefiPayloadPkg/Include/Library/BlParseLib.h b/UefiPayloadPkg/Include/Library/BlParseLib.h
index 7198e419bd..fb7bb0cb0e 100644
--- a/UefiPayloadPkg/Include/Library/BlParseLib.h
+++ b/UefiPayloadPkg/Include/Library/BlParseLib.h
@@ -13,8 +13,9 @@
#include <Guid/GraphicsInfoHob.h>
#include <Guid/MemoryMapInfoGuid.h>
#include <Guid/SerialPortInfoGuid.h>
-#include <Guid/SystemTableInfoGuid.h>
#include <Guid/AcpiBoardInfoGuid.h>
+#include <UniversalPayload/AcpiTable.h>
+#include <UniversalPayload/SmbiosTable.h>
#define GET_BOOTLOADER_PARAMETER() PcdGet64 (PcdBootloaderParameter)
@@ -55,9 +56,9 @@ ParseMemoryInfo (
);
/**
- Acquire acpi table and smbios table from slim bootloader
+ Acquire SMBIOS table from bootloader.
- @param SystemTableInfo Pointer to the system table info
+ @param SmbiosTable Pointer to the system table info
@retval RETURN_SUCCESS Successfully find out the tables.
@retval RETURN_NOT_FOUND Failed to find the tables.
@@ -65,10 +66,24 @@ ParseMemoryInfo (
**/
RETURN_STATUS
EFIAPI
-ParseSystemTable (
- OUT SYSTEM_TABLE_INFO *SystemTableInfo
+ParseSmbiosTable (
+ OUT UNIVERSAL_PAYLOAD_SMBIOS_TABLE *SmbiosTable
);
+/**
+ Acquire ACPI table from bootloader.
+
+ @param AcpiTableHob Pointer to the ACPI table info.
+
+ @retval RETURN_SUCCESS Successfully find out the tables.
+ @retval RETURN_NOT_FOUND Failed to find the tables.
+
+**/
+RETURN_STATUS
+EFIAPI
+ParseAcpiTableInfo (
+ OUT UNIVERSAL_PAYLOAD_ACPI_TABLE *AcpiTableHob
+ );
/**
Find the serial port information