summaryrefslogtreecommitdiffstats
path: root/DynamicTablesPkg/Include
diff options
context:
space:
mode:
authorSami Mujawar <sami.mujawar@arm.com>2019-02-25 20:36:57 +0000
committerSami Mujawar <sami.mujawar@arm.com>2019-02-26 08:53:43 +0000
commitbdbbedea949eb4b10d24110c0e559b03c7a6bce4 (patch)
tree130472b09d31ae877428ce28e93ff83a9fb563c9 /DynamicTablesPkg/Include
parentdb8382ef5e44bd07654fb4726b77f3c329210561 (diff)
downloadedk2-bdbbedea949eb4b10d24110c0e559b03c7a6bce4.tar.gz
edk2-bdbbedea949eb4b10d24110c0e559b03c7a6bce4.tar.bz2
edk2-bdbbedea949eb4b10d24110c0e559b03c7a6bce4.zip
Revert "DynamicTablesPkg: Add OEM Info"
This reverts commit c788bdaba47536447ae37518a96d92e0da54aad7. Reverting this patch as Soft Feature Freeze for edk2-stable201903 started on 22 Feb 2019. Cc: Laszlo Ersek <lersek@redhat.com> Cc: Alexei Fedorov <alexei.fedorov@arm.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar <sami.mujawar@arm.com> Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>
Diffstat (limited to 'DynamicTablesPkg/Include')
-rw-r--r--DynamicTablesPkg/Include/Library/TableHelperLib.h4
-rw-r--r--DynamicTablesPkg/Include/StandardNameSpaceObjects.h18
2 files changed, 2 insertions, 20 deletions
diff --git a/DynamicTablesPkg/Include/Library/TableHelperLib.h b/DynamicTablesPkg/Include/Library/TableHelperLib.h
index 0f872bc3d0..3c4e1d23d2 100644
--- a/DynamicTablesPkg/Include/Library/TableHelperLib.h
+++ b/DynamicTablesPkg/Include/Library/TableHelperLib.h
@@ -45,7 +45,7 @@ GetCgfMgrInfo (
@param [in] Generator Pointer to the ACPI table Generator.
@param [in,out] AcpiHeader Pointer to the ACPI table header to be
updated.
- @param [in] AcpiTableInfo Pointer to the ACPI table info structure.
+ @param [in] Revision Revision of the ACPI table.
@param [in] Length Length of the ACPI table.
@retval EFI_SUCCESS The ACPI table is updated successfully.
@@ -61,7 +61,7 @@ AddAcpiHeader (
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,
IN CONST ACPI_TABLE_GENERATOR * CONST Generator,
IN OUT EFI_ACPI_DESCRIPTION_HEADER * CONST AcpiHeader,
- IN CONST CM_STD_OBJ_ACPI_TABLE_INFO * CONST AcpiTableInfo,
+ IN CONST UINT32 Revision,
IN CONST UINT32 Length
);
diff --git a/DynamicTablesPkg/Include/StandardNameSpaceObjects.h b/DynamicTablesPkg/Include/StandardNameSpaceObjects.h
index 58503858b2..4377ee8f78 100644
--- a/DynamicTablesPkg/Include/StandardNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/StandardNameSpaceObjects.h
@@ -93,24 +93,6 @@ typedef struct CmAStdObjAcpiTableInfo {
/// Optional pointer to the ACPI table data
EFI_ACPI_DESCRIPTION_HEADER * AcpiTableData;
- /// An OEM-supplied string that the OEM uses to identify the particular
- /// data table. This field is particularly useful when defining a definition
- /// block to distinguish definition block functions. The OEM assigns each
- /// dissimilar table a new OEM Table ID.
- /// This field could be constructed using the SIGNATURE_64() macro.
- /// e.g. SIGNATURE_64 ('A','R','M','H','G','T','D','T')
- /// Note: If this field is not populated (has value of Zero), then the
- /// Generators shall populate this information using part of the
- /// CM_STD_OBJ_CONFIGURATION_MANAGER_INFO.OemId field and the
- /// ACPI table signature.
- UINT64 OemTableId;
-
- /// An OEM-supplied revision number. Larger numbers are assumed to be
- /// newer revisions.
- /// Note: If this field is not populated (has value of Zero), then the
- /// Generators shall populate this information using the revision of the
- /// Configuration Manager (CM_STD_OBJ_CONFIGURATION_MANAGER_INFO.Revision).
- UINT32 OemRevision;
} CM_STD_OBJ_ACPI_TABLE_INFO;
/** A structure used to describe the SMBIOS table generators to be invoked.