Revision: 14685
          http://sourceforge.net/p/edk2/code/14685
Author:   vanjeff
Date:     2013-09-18 03:01:41 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Sync patch r14672 from main trunk.
Create PCDs in MdeModulePkg for ACPI table 
OEM_ID/OEM_TABLE_ID/OEM_REVISION/CREATOR_ID/CREATOR_REVISION customization.

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/14672

Modified Paths:
--------------
    
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h
    
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c
    
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
    branches/UDK2010.SR1/MdeModulePkg/MdeModulePkg.dec
    branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
    
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
    
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
    
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
    
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
    
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
    
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
    branches/UDK2010.SR1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
    branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
    branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
    branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
    branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
    branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
    branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/Tpm.asl

Modified: 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h
===================================================================
--- 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h
    2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupport.h
    2013-09-18 03:01:41 UTC (rev 14685)
@@ -2,7 +2,7 @@
   This is an implementation of the ACPI Support protocol.
   It is in compliance with the 0.9 definition of the protocol.
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -80,15 +80,6 @@
 #define EFI_ACPI_MAX_NUM_TABLES 20
 
 //
-// ACPI table information used to initialize tables.
-//
-#define EFI_ACPI_OEM_ID           "INTEL "
-#define EFI_ACPI_OEM_TABLE_ID     0x2020204F4E414954ULL  // "TIANO   "
-#define EFI_ACPI_OEM_REVISION     0x00000002
-#define EFI_ACPI_CREATOR_ID       0x20202020
-#define EFI_ACPI_CREATOR_REVISION 0x01000013
-
-//
 // Protocol private structure definition
 //
 //

Modified: 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c
===================================================================
--- 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c
 2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c
 2013-09-18 03:01:41 UTC (rev 14685)
@@ -1,7 +1,7 @@
 /** @file
   ACPI Support Protocol implementation
 
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -1839,13 +1839,13 @@
   //
   CurrentData = EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE;
   CopyMem (&AcpiSupportInstance->Rsdp1->Signature, &CurrentData, sizeof 
(UINT64));
-  CopyMem (AcpiSupportInstance->Rsdp1->OemId, EFI_ACPI_OEM_ID, 6);
+  CopyMem (AcpiSupportInstance->Rsdp1->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiSupportInstance->Rsdp1->OemId));
   AcpiSupportInstance->Rsdp1->Reserved    = EFI_ACPI_RESERVED_BYTE;
   AcpiSupportInstance->Rsdp1->RsdtAddress = (UINT32) (UINTN) 
AcpiSupportInstance->Rsdt1;
 
   CurrentData = EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE;
   CopyMem (&AcpiSupportInstance->Rsdp3->Signature, &CurrentData, sizeof 
(UINT64));
-  CopyMem (AcpiSupportInstance->Rsdp3->OemId, EFI_ACPI_OEM_ID, 6);
+  CopyMem (AcpiSupportInstance->Rsdp3->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiSupportInstance->Rsdp3->OemId));
   AcpiSupportInstance->Rsdp3->Revision    = 
EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION;
   AcpiSupportInstance->Rsdp3->RsdtAddress = (UINT32) (UINTN) 
AcpiSupportInstance->Rsdt3;
   AcpiSupportInstance->Rsdp3->Length      = sizeof 
(EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER);
@@ -1863,12 +1863,12 @@
   AcpiSupportInstance->Rsdt1->Signature = 
EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;
   AcpiSupportInstance->Rsdt1->Length    = sizeof (EFI_ACPI_DESCRIPTION_HEADER);
   AcpiSupportInstance->Rsdt1->Revision  = 
EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION;
-  CopyMem (AcpiSupportInstance->Rsdt1->OemId, EFI_ACPI_OEM_ID, 6);
-  CurrentData = EFI_ACPI_OEM_TABLE_ID;
+  CopyMem (AcpiSupportInstance->Rsdt1->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiSupportInstance->Rsdt1->OemId));
+  CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);
   CopyMem (&AcpiSupportInstance->Rsdt1->OemTableId, &CurrentData, sizeof 
(UINT64));
-  AcpiSupportInstance->Rsdt1->OemRevision     = EFI_ACPI_OEM_REVISION;
-  AcpiSupportInstance->Rsdt1->CreatorId       = EFI_ACPI_CREATOR_ID;
-  AcpiSupportInstance->Rsdt1->CreatorRevision = EFI_ACPI_CREATOR_REVISION;
+  AcpiSupportInstance->Rsdt1->OemRevision     = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  AcpiSupportInstance->Rsdt1->CreatorId       = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  AcpiSupportInstance->Rsdt1->CreatorRevision = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
   //
   // We always reserve first one for FADT
   //
@@ -1878,12 +1878,12 @@
   AcpiSupportInstance->Rsdt3->Signature       = 
EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;
   AcpiSupportInstance->Rsdt3->Length          = sizeof 
(EFI_ACPI_DESCRIPTION_HEADER);
   AcpiSupportInstance->Rsdt3->Revision        = 
EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION;
-  CopyMem (AcpiSupportInstance->Rsdt3->OemId, EFI_ACPI_OEM_ID, 6);
-  CurrentData = EFI_ACPI_OEM_TABLE_ID;
+  CopyMem (AcpiSupportInstance->Rsdt3->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiSupportInstance->Rsdt3->OemId));
+  CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);
   CopyMem (&AcpiSupportInstance->Rsdt3->OemTableId, &CurrentData, sizeof 
(UINT64));
-  AcpiSupportInstance->Rsdt3->OemRevision     = EFI_ACPI_OEM_REVISION;
-  AcpiSupportInstance->Rsdt3->CreatorId       = EFI_ACPI_CREATOR_ID;
-  AcpiSupportInstance->Rsdt3->CreatorRevision = EFI_ACPI_CREATOR_REVISION;
+  AcpiSupportInstance->Rsdt3->OemRevision     = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  AcpiSupportInstance->Rsdt3->CreatorId       = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  AcpiSupportInstance->Rsdt3->CreatorRevision = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
   //
   // We always reserve first one for FADT
   //
@@ -1896,12 +1896,12 @@
   AcpiSupportInstance->Xsdt->Signature  = 
EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;
   AcpiSupportInstance->Xsdt->Length     = sizeof (EFI_ACPI_DESCRIPTION_HEADER);
   AcpiSupportInstance->Xsdt->Revision   = 
EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION;
-  CopyMem (AcpiSupportInstance->Xsdt->OemId, EFI_ACPI_OEM_ID, 6);
-  CurrentData = EFI_ACPI_OEM_TABLE_ID;
+  CopyMem (AcpiSupportInstance->Xsdt->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiSupportInstance->Xsdt->OemId));
+  CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);
   CopyMem (&AcpiSupportInstance->Xsdt->OemTableId, &CurrentData, sizeof 
(UINT64));
-  AcpiSupportInstance->Xsdt->OemRevision      = EFI_ACPI_OEM_REVISION;
-  AcpiSupportInstance->Xsdt->CreatorId        = EFI_ACPI_CREATOR_ID;
-  AcpiSupportInstance->Xsdt->CreatorRevision  = EFI_ACPI_CREATOR_REVISION;
+  AcpiSupportInstance->Xsdt->OemRevision      = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  AcpiSupportInstance->Xsdt->CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  AcpiSupportInstance->Xsdt->CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
   //
   // We always reserve first one for FADT
   //

Modified: 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
===================================================================
--- 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
       2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportDxe.inf
       2013-09-18 03:01:41 UTC (rev 14685)
@@ -4,7 +4,7 @@
 # This driver initializes ACPI support protocol instance data structure and 
intstall 
 # ACPI support protocol to provide Get, Set and Publish Table services.
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions
@@ -62,6 +62,13 @@
 [FeaturePcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdInstallAcpiSupportProtocol
 
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
+
 [Protocols]
   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED
   gEfiAcpiSupportProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED

Modified: branches/UDK2010.SR1/MdeModulePkg/MdeModulePkg.dec
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/MdeModulePkg.dec  2013-09-18 02:53:10 UTC 
(rev 14684)
+++ branches/UDK2010.SR1/MdeModulePkg/MdeModulePkg.dec  2013-09-18 03:01:41 UTC 
(rev 14685)
@@ -650,6 +650,21 @@
   #
   
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress|0x0|UINT64|0x30001027
 
+  ## Default OEM ID for ACPI table creation, its length must be 0x6 bytes to 
follow ACPI specification.
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId|"INTEL "|VOID*|0x30001034
+
+  ## Default OEM Table ID for ACPI table creation, it is "EDK2    ".
+  
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId|0x20202020324B4445|UINT64|0x30001035
+
+  ## Default OEM Revision for ACPI table creation.
+  
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision|0x00000002|UINT32|0x30001036
+
+  ## Default Creator ID for ACPI table creation.
+  
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId|0x20202020|UINT32|0x30001037
+
+  ## Default Creator Revision for ACPI table creation.
+  
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision|0x01000013|UINT32|0x30001038
+
 [PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
   ## This PCD defines the Console output column and the default value is 25 
according to UEFI spec.
   #  This PCD could be set to 0 then console output could be at max column and 
max row.

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h   
2013-09-18 02:53:10 UTC (rev 14684)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h   
2013-09-18 03:01:41 UTC (rev 14685)
@@ -1,7 +1,7 @@
 /** @file
   ACPI Table Protocol Driver
 
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -107,15 +107,6 @@
 #define EFI_ACPI_MAX_NUM_TABLES 20
 
 //
-// ACPI table information used to initialize tables.
-//
-#define EFI_ACPI_OEM_ID           "INTEL "
-#define EFI_ACPI_OEM_TABLE_ID     SIGNATURE_64('E', 'D', 'K', '2', ' ', ' ', ' 
', ' ')
-#define EFI_ACPI_OEM_REVISION     0x00000002
-#define EFI_ACPI_CREATOR_ID       0x20202020
-#define EFI_ACPI_CREATOR_REVISION 0x01000013
-
-//
 // Protocol private structure definition
 //
 //

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
===================================================================
--- 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf  
    2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf  
    2013-09-18 03:01:41 UTC (rev 14685)
@@ -1,7 +1,7 @@
 ## @file
 #  ACPI Table Protocol Driver
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials are
 #  licensed and made available under the terms and conditions of the BSD 
License
 #  which accompanies this distribution.  The full text of the license may be 
found at
@@ -60,6 +60,13 @@
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol
 
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
+
 [Protocols]
   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED
   gEfiAcpiSdtProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
===================================================================
--- 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
   2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
   2013-09-18 03:01:41 UTC (rev 14685)
@@ -1,7 +1,7 @@
 /** @file
   ACPI Table Protocol Implementation
 
-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD 
License
   which accompanies this distribution.  The full text of the license may be 
found at
@@ -1795,13 +1795,13 @@
   //
   CurrentData = EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE;
   CopyMem (&AcpiTableInstance->Rsdp1->Signature, &CurrentData, sizeof 
(UINT64));
-  CopyMem (AcpiTableInstance->Rsdp1->OemId, EFI_ACPI_OEM_ID, 6);
+  CopyMem (AcpiTableInstance->Rsdp1->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiTableInstance->Rsdp1->OemId));
   AcpiTableInstance->Rsdp1->Reserved    = EFI_ACPI_RESERVED_BYTE;
   AcpiTableInstance->Rsdp1->RsdtAddress = (UINT32) (UINTN) 
AcpiTableInstance->Rsdt1;
 
   CurrentData = EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE;
   CopyMem (&AcpiTableInstance->Rsdp3->Signature, &CurrentData, sizeof 
(UINT64));
-  CopyMem (AcpiTableInstance->Rsdp3->OemId, EFI_ACPI_OEM_ID, 6);
+  CopyMem (AcpiTableInstance->Rsdp3->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiTableInstance->Rsdp3->OemId));
   AcpiTableInstance->Rsdp3->Revision    = 
EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION;
   AcpiTableInstance->Rsdp3->RsdtAddress = (UINT32) (UINTN) 
AcpiTableInstance->Rsdt3;
   AcpiTableInstance->Rsdp3->Length      = sizeof 
(EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER);
@@ -1819,12 +1819,12 @@
   AcpiTableInstance->Rsdt1->Signature = 
EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;
   AcpiTableInstance->Rsdt1->Length    = sizeof (EFI_ACPI_DESCRIPTION_HEADER);
   AcpiTableInstance->Rsdt1->Revision  = 
EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION;
-  CopyMem (AcpiTableInstance->Rsdt1->OemId, EFI_ACPI_OEM_ID, 6);
-  CurrentData = EFI_ACPI_OEM_TABLE_ID;
+  CopyMem (AcpiTableInstance->Rsdt1->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiTableInstance->Rsdt1->OemId));
+  CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);
   CopyMem (&AcpiTableInstance->Rsdt1->OemTableId, &CurrentData, sizeof 
(UINT64));
-  AcpiTableInstance->Rsdt1->OemRevision     = EFI_ACPI_OEM_REVISION;
-  AcpiTableInstance->Rsdt1->CreatorId       = EFI_ACPI_CREATOR_ID;
-  AcpiTableInstance->Rsdt1->CreatorRevision = EFI_ACPI_CREATOR_REVISION;
+  AcpiTableInstance->Rsdt1->OemRevision     = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  AcpiTableInstance->Rsdt1->CreatorId       = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  AcpiTableInstance->Rsdt1->CreatorRevision = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
   //
   // We always reserve first one for FADT
   //
@@ -1834,12 +1834,12 @@
   AcpiTableInstance->Rsdt3->Signature       = 
EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;
   AcpiTableInstance->Rsdt3->Length          = sizeof 
(EFI_ACPI_DESCRIPTION_HEADER);
   AcpiTableInstance->Rsdt3->Revision        = 
EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION;
-  CopyMem (AcpiTableInstance->Rsdt3->OemId, EFI_ACPI_OEM_ID, 6);
-  CurrentData = EFI_ACPI_OEM_TABLE_ID;
+  CopyMem (AcpiTableInstance->Rsdt3->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiTableInstance->Rsdt3->OemId));
+  CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);
   CopyMem (&AcpiTableInstance->Rsdt3->OemTableId, &CurrentData, sizeof 
(UINT64));
-  AcpiTableInstance->Rsdt3->OemRevision     = EFI_ACPI_OEM_REVISION;
-  AcpiTableInstance->Rsdt3->CreatorId       = EFI_ACPI_CREATOR_ID;
-  AcpiTableInstance->Rsdt3->CreatorRevision = EFI_ACPI_CREATOR_REVISION;
+  AcpiTableInstance->Rsdt3->OemRevision     = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  AcpiTableInstance->Rsdt3->CreatorId       = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  AcpiTableInstance->Rsdt3->CreatorRevision = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
   //
   // We always reserve first one for FADT
   //
@@ -1852,12 +1852,12 @@
   AcpiTableInstance->Xsdt->Signature  = 
EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;
   AcpiTableInstance->Xsdt->Length     = sizeof (EFI_ACPI_DESCRIPTION_HEADER);
   AcpiTableInstance->Xsdt->Revision   = 
EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION;
-  CopyMem (AcpiTableInstance->Xsdt->OemId, EFI_ACPI_OEM_ID, 6);
-  CurrentData = EFI_ACPI_OEM_TABLE_ID;
+  CopyMem (AcpiTableInstance->Xsdt->OemId, PcdGetPtr (PcdAcpiDefaultOemId), 
sizeof (AcpiTableInstance->Xsdt->OemId));
+  CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);
   CopyMem (&AcpiTableInstance->Xsdt->OemTableId, &CurrentData, sizeof 
(UINT64));
-  AcpiTableInstance->Xsdt->OemRevision      = EFI_ACPI_OEM_REVISION;
-  AcpiTableInstance->Xsdt->CreatorId        = EFI_ACPI_CREATOR_ID;
-  AcpiTableInstance->Xsdt->CreatorRevision  = EFI_ACPI_CREATOR_REVISION;
+  AcpiTableInstance->Xsdt->OemRevision      = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  AcpiTableInstance->Xsdt->CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  AcpiTableInstance->Xsdt->CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
   //
   // We always reserve first one for FADT
   //

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
===================================================================
--- 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
        2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
        2013-09-18 03:01:41 UTC (rev 14685)
@@ -27,17 +27,9 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
 
 //
-// ACPI table information used to initialize tables.
-//
-#define EFI_ACPI_OEM_ID           "INTEL"
-#define EFI_ACPI_OEM_TABLE_ID     0x2020204F4E414954ULL // "TIANO   "
-#define EFI_ACPI_OEM_REVISION     0x00000001
-#define EFI_ACPI_CREATOR_ID       0x5446534D            // TBD "MSFT"
-#define EFI_ACPI_CREATOR_REVISION 0x01000013            // TBD
-
-//
 // Module globals.
 //
 EFI_EVENT  mBootGraphicsReadyToBootEvent;
@@ -81,13 +73,13 @@
     EFI_ACPI_5_0_BOOT_GRAPHICS_RESOURCE_TABLE_REVISION,     // Revision
     0x00,  // Checksum will be updated at runtime
     //
-    // It is expected that these values will be updated at runtime.
+    // It is expected that these values will be updated at EntryPoint.
     //
-    EFI_ACPI_OEM_ID,            // OEMID is a 6 bytes long field
-    EFI_ACPI_OEM_TABLE_ID,      // OEM table identification(8 bytes long)
-    EFI_ACPI_OEM_REVISION,      // OEM revision number
-    EFI_ACPI_CREATOR_ID,        // ASL compiler vendor ID
-    EFI_ACPI_CREATOR_REVISION,  // ASL compiler revision number
+    {0x00},     // OEM ID is a 6 bytes long field
+    0x00,       // OEM Table ID(8 bytes long)
+    0x00,       // OEM Revision
+    0x00,       // Creator ID
+    0x00,       // Creator Revision
   },
   EFI_ACPI_5_0_BGRT_VERSION,         // Version
   EFI_ACPI_5_0_BGRT_STATUS_VALID,    // Status
@@ -467,7 +459,19 @@
   )
 {
   EFI_STATUS  Status;
+  UINT64      OemTableId;
 
+  CopyMem (
+    mBootGraphicsResourceTableTemplate.Header.OemId,
+    PcdGetPtr (PcdAcpiDefaultOemId),
+    sizeof (mBootGraphicsResourceTableTemplate.Header.OemId)
+    );
+  OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);
+  CopyMem (&mBootGraphicsResourceTableTemplate.Header.OemTableId, &OemTableId, 
sizeof (UINT64));
+  mBootGraphicsResourceTableTemplate.Header.OemRevision      = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  mBootGraphicsResourceTableTemplate.Header.CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  mBootGraphicsResourceTableTemplate.Header.CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
+
   //
   // Install Boot Logo protocol.
   //

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
===================================================================
--- 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
      2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
      2013-09-18 03:01:41 UTC (rev 14685)
@@ -1,7 +1,7 @@
 ## @file
 #  This module install ACPI Boot Graphics Resource Table (BGRT).
 #
-#  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD 
License
 #  which accompanies this distribution.  The full text of the license may be 
found at
@@ -41,10 +41,18 @@
   UefiLib
   UefiBootServicesTableLib
   DebugLib
+  PcdLib
 
 [Protocols]
   gEfiAcpiTableProtocolGuid                     ## SOMETIMES_CONSUMES
   gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES
 
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
+
 [Guids]
   gEfiEventReadyToBootGuid                      ## CONSUMES

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
===================================================================
--- 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
   2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
   2013-09-18 03:01:41 UTC (rev 14685)
@@ -43,14 +43,6 @@
 #include <Library/LockBoxLib.h>
 #include <Library/UefiLib.h>
 
-//
-// ACPI table information used to initialize tables.
-//
-#define EFI_ACPI_OEM_ID           "INTEL"
-#define EFI_ACPI_OEM_TABLE_ID     0x2020204F4E414954ULL // "TIANO   "
-#define EFI_ACPI_OEM_REVISION     0x00000001
-#define EFI_ACPI_CREATOR_ID       0x5446534D            // TBD "MSFT"
-#define EFI_ACPI_CREATOR_REVISION 0x01000013            // TBD
 #define EXTENSION_RECORD_SIZE     0x10000
 #define SMM_BOOT_RECORD_COMM_SIZE OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data) 
+ sizeof(SMM_BOOT_RECORD_COMMUNICATE)
 
@@ -75,13 +67,13 @@
     EFI_ACPI_5_0_FIRMWARE_PERFORMANCE_DATA_TABLE_REVISION,    // Revision
     0x00, // Checksum will be updated at runtime
     //
-    // It is expected that these values will be updated at runtime.
+    // It is expected that these values will be updated at EntryPoint.
     //
-    EFI_ACPI_OEM_ID,            // OEMID is a 6 bytes long field
-    EFI_ACPI_OEM_TABLE_ID,      // OEM table identification(8 bytes long)
-    EFI_ACPI_OEM_REVISION,      // OEM revision number
-    EFI_ACPI_CREATOR_ID,        // ASL compiler vendor ID
-    EFI_ACPI_CREATOR_REVISION,  // ASL compiler revision number
+    {0x00},     // OEM ID is a 6 bytes long field
+    0x00,       // OEM Table ID(8 bytes long)
+    0x00,       // OEM Revision
+    0x00,       // Creator ID
+    0x00,       // Creator Revision
   },
   //
   // Firmware Basic Boot Performance Table Pointer Record.
@@ -780,7 +772,19 @@
   EFI_HOB_GUID_TYPE        *GuidHob;
   FIRMWARE_SEC_PERFORMANCE *Performance;
   VOID                     *Registration;
+  UINT64                   OemTableId;
 
+  CopyMem (
+    mFirmwarePerformanceTableTemplate.Header.OemId,
+    PcdGetPtr (PcdAcpiDefaultOemId),
+    sizeof (mFirmwarePerformanceTableTemplate.Header.OemId)
+    );
+  OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);
+  CopyMem (&mFirmwarePerformanceTableTemplate.Header.OemTableId, &OemTableId, 
sizeof (UINT64));
+  mFirmwarePerformanceTableTemplate.Header.OemRevision      = PcdGet32 
(PcdAcpiDefaultOemRevision);
+  mFirmwarePerformanceTableTemplate.Header.CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
+  mFirmwarePerformanceTableTemplate.Header.CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
+
   //
   // Get Report Status Code Handler Protocol.
   //

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
===================================================================
--- 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
 2013-09-18 02:53:10 UTC (rev 14684)
+++ 
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
 2013-09-18 03:01:41 UTC (rev 14685)
@@ -75,6 +75,11 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad
   gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart
   gEfiMdeModulePkgTokenSpaceGuid.PcdExtFpdtBootRecordPadSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
 
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support

Modified: 
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c    
2013-09-18 02:53:10 UTC (rev 14684)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c    
2013-09-18 03:01:41 UTC (rev 14685)
@@ -1,7 +1,7 @@
 /** @file
   Implementation for iSCSI Boot Firmware Table publication.
 
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD 
License
 which accompanies this distribution.  The full text of the license may be 
found at
@@ -37,12 +37,6 @@
   Header->Length    = IBFT_HEAP_OFFSET;
   Header->Revision  = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_REVISION;
   Header->Checksum  = 0;
-
-  Header->OemId[0]  = 'I';
-  Header->OemId[1]  = 'N';
-  Header->OemId[2]  = 'T';
-  Header->OemId[3]  = 'E';
-  Header->OemId[4]  = 'L';
   
   CopyMem (Header->OemId, OemId, sizeof (Header->OemId));
   CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));

Modified: branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.c        2013-09-18 
02:53:10 UTC (rev 14684)
+++ branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.c        2013-09-18 
03:01:41 UTC (rev 14685)
@@ -8,7 +8,7 @@
 
 TcgDxePassThroughToTpm() will receive untrusted input and do basic validation.
 
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD 
License 
 which accompanies this distribution.  The full text of the license may be 
found at 
@@ -1177,6 +1177,7 @@
   EFI_STATUS                        Status;
   EFI_ACPI_TABLE_PROTOCOL           *AcpiTable;
   UINT8                             Checksum;
+  UINT64                            OemTableId;
 
   Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID 
**)&AcpiTable);
   if (EFI_ERROR (Status)) {
@@ -1184,7 +1185,12 @@
   }
 
   if (PcdGet8 (PcdTpmPlatformClass) == TCG_PLATFORM_TYPE_CLIENT) {
- 
+    CopyMem (mTcgClientAcpiTemplate.Header.OemId, PcdGetPtr 
(PcdAcpiDefaultOemId), sizeof (mTcgClientAcpiTemplate.Header.OemId));
+    OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);
+    CopyMem (&mTcgClientAcpiTemplate.Header.OemTableId, &OemTableId, sizeof 
(UINT64));
+    mTcgClientAcpiTemplate.Header.OemRevision      = PcdGet32 
(PcdAcpiDefaultOemRevision);
+    mTcgClientAcpiTemplate.Header.CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
+    mTcgClientAcpiTemplate.Header.CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
     //
     // The ACPI table must be checksumed before calling the InstallAcpiTable() 
     // service of the ACPI table protocol to install it.
@@ -1199,7 +1205,12 @@
                             &TableKey
                             );
   } else {
-
+    CopyMem (mTcgServerAcpiTemplate.Header.OemId, PcdGetPtr 
(PcdAcpiDefaultOemId), sizeof (mTcgServerAcpiTemplate.Header.OemId));
+    OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);
+    CopyMem (&mTcgServerAcpiTemplate.Header.OemTableId, &OemTableId, sizeof 
(UINT64));
+    mTcgServerAcpiTemplate.Header.OemRevision      = PcdGet32 
(PcdAcpiDefaultOemRevision);
+    mTcgServerAcpiTemplate.Header.CreatorId        = PcdGet32 
(PcdAcpiDefaultCreatorId);
+    mTcgServerAcpiTemplate.Header.CreatorRevision  = PcdGet32 
(PcdAcpiDefaultCreatorRevision);
     //
     // The ACPI table must be checksumed before calling the InstallAcpiTable() 
     // service of the ACPI table protocol to install it.

Modified: branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf      2013-09-18 
02:53:10 UTC (rev 14684)
+++ branches/UDK2010.SR1/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf      2013-09-18 
03:01:41 UTC (rev 14685)
@@ -2,7 +2,7 @@
 #  Component file for module TcgDxe.
 #  This module will produce TCG protocol and measure boot environment.
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD 
License
 # which accompanies this distribution. The full text of the license may be 
found at
@@ -49,6 +49,7 @@
   TpmCommLib
   PrintLib
   UefiLib
+  PcdLib
 
 [Guids]
   gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED
@@ -66,6 +67,11 @@
 
 [Pcd]
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
 
 [Depex]
   TRUE

Modified: branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.c        2013-09-18 
02:53:10 UTC (rev 14684)
+++ branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.c        2013-09-18 
03:01:41 UTC (rev 14685)
@@ -339,6 +339,7 @@
 
 
   ASSERT (Table->OemTableId == SIGNATURE_64 ('T', 'c', 'g', 'T', 'a', 'b', 
'l', 'e'));
+  CopyMem (Table->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof 
(Table->OemId) );
   mTcgNvs = AssignOpRegion (Table, SIGNATURE_32 ('T', 'N', 'V', 'S'), (UINT16) 
sizeof (TCG_NVS));
   ASSERT (mTcgNvs != NULL);
 

Modified: branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.h        2013-09-18 
02:53:10 UTC (rev 14684)
+++ branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.h        2013-09-18 
03:01:41 UTC (rev 14685)
@@ -1,7 +1,7 @@
 /** @file
   The header file for TCG SMM driver.
   
-Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD 
License 
 which accompanies this distribution.  The full text of the license may be 
found at 
@@ -34,6 +34,7 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DxeServicesLib.h>
 #include <Library/TpmMeasurementLib.h>
+#include <Library/PcdLib.h>
 
 #pragma pack(1)
 typedef struct {

Modified: branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf      2013-09-18 
02:53:10 UTC (rev 14684)
+++ branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf      2013-09-18 
03:01:41 UTC (rev 14685)
@@ -7,7 +7,7 @@
 #  This driver will have external input - variable and ACPINvs data in SMM 
mode.
 #  This external input must be validated carefully to avoid security issue.
 #
-# Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD 
License
 # which accompanies this distribution. The full text of the license may be 
found at
@@ -45,6 +45,7 @@
   DebugLib
   DxeServicesLib
   TpmMeasurementLib
+  PcdLib
 
 [Guids]
   gEfiPhysicalPresenceGuid
@@ -55,6 +56,9 @@
   gEfiSmmVariableProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED
   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
 
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
+
 [Depex]
   gEfiAcpiTableProtocolGuid AND
   gEfiSmmSwDispatch2ProtocolGuid AND

Modified: branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/Tpm.asl
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/Tpm.asl 2013-09-18 02:53:10 UTC 
(rev 14684)
+++ branches/UDK2010.SR1/SecurityPkg/Tcg/TcgSmm/Tpm.asl 2013-09-18 03:01:41 UTC 
(rev 14685)
@@ -2,7 +2,7 @@
   The TPM definition block in ACPI table for physical presence  
   and MemoryClear.
 
-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD 
License 
 which accompanies this distribution.  The full text of the license may be 
found at 
@@ -17,7 +17,7 @@
   "Tpm.aml",
   "SSDT",
   1,
-  "Intel_",
+  "INTEL ",
   "TcgTable",
   0x1000
   )

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to