Remove status code modules' dependency on IntelFrameworkModulePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9604 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Include/Guid/MemoryStatusCodeRecord.h b/IntelFrameworkModulePkg/Include/Guid/MemoryStatusCodeRecord.h
deleted file mode 100644 (file)
index 7599926..0000000
--- a/IntelFrameworkModulePkg/Include/Guid/MemoryStatusCodeRecord.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/** @file\r
-  GUID used to identify status code records HOB that originate from the PEI status code    \r
-  \r
-  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                            \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-**/\r
-\r
-#ifndef __MEMORY_STATUS_CODE_RECORD_H__\r
-#define __MEMORY_STATUS_CODE_RECORD_H__\r
-\r
-///\r
-/// Global ID used to identify GUIDed HOBs that start with a structure of type \r
-/// MEMORY_STATUSCODE_PACKET_HEADER followed by an array of structures of type \r
-/// MEMORY_STATUSCODE_RECORD.  These GUIDed HOBs record all the information \r
-/// passed into the ReportStatusCode() service of PEI Services Table.\r
-///\r
-///  <pre>\r
-///  Memory status code records packet structure :\r
-///  +---------------+----------+----------+-----+----------+-----+----------+\r
-///  | Packet Header | Record 1 | Record 2 | ... + Record n | ... | Record m |\r
-///  +---------------+----------+----------+-----+----------+-----+----------+\r
-///                  ^                                 ^                     ^\r
-///                  +--------- RecordIndex -----------+                     |\r
-///                  +---------------- MaxRecordsNumber----------------------+\r
-///  </pre>\r
-///\r
-#define MEMORY_STATUS_CODE_RECORD_GUID \\r
-  { \\r
-    0x60cc026, 0x4c0d, 0x4dda, {0x8f, 0x41, 0x59, 0x5f, 0xef, 0x0, 0xa5, 0x2} \\r
-  }\r
-\r
-///\r
-/// A header structure that is followed by an array of records that contain the \r
-/// parameters passed into the ReportStatusCode() service in the PEI Services Table.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// Index of the packet\r
-  ///\r
-  UINT16  PacketIndex;\r
-  ///\r
-  /// The number of active records in the packet\r
-  ///\r
-  UINT16  RecordIndex;\r
-  ///\r
-  /// The maximum number of records that the packet can store\r
-  ///\r
-  UINT32  MaxRecordsNumber;\r
-} MEMORY_STATUSCODE_PACKET_HEADER;\r
-\r
-///\r
-/// A structure that contains the parameters passed into the ReportStatusCode() \r
-/// service in the PEI Services Table.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// Status Code type to be reported.\r
-  ///\r
-  EFI_STATUS_CODE_TYPE   CodeType;\r
-\r
-  ///\r
-  /// An operation, plus value information about the class and subclass, used to\r
-  /// classify the hardware and software entity.\r
-  ///\r
-  EFI_STATUS_CODE_VALUE  Value;\r
-\r
-  ///\r
-  /// The enumeration of a hardware or software entity within\r
-  /// the system. Valid instance numbers start with 1\r
-  ///\r
-  UINT32                 Instance;\r
-} MEMORY_STATUSCODE_RECORD;\r
-\r
-extern EFI_GUID gMemoryStatusCodeRecordGuid;\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h b/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
deleted file mode 100644 (file)
index 52e7c95..0000000
--- a/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/** @file\r
-  This file defines the GUID and data structure used to pass DEBUG() macro \r
-  information to the Status Code Protocol and Status Code PPI.\r
-\r
-  Copyright (c) 2007 - 2009, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _STATUS_CODE_DATA_TYPE_DEBUG_H_\r
-#define _STATUS_CODE_DATA_TYPE_DEBUG_H_\r
-\r
-///\r
-/// Global ID used to identify a structure of type EFI_DEBUG_INFO\r
-///\r
-#define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \\r
-  { \\r
-    0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } \\r
-  }\r
-\r
-///\r
-/// The maximum size of an EFI_DEBUG_INFO structure\r
-///\r
-#define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
-\r
-///\r
-/// This structure contains the ErrorLevel passed into the DEBUG() macro, followed \r
-/// by a 96-byte buffer that contains the variable argument list passed to the \r
-//  DEBUG() macro that has been converted to a BASE_LIST.  The 96-byte buffer is \r
-/// followed by a Null-terminated ASCII string that is the Format string passed \r
-/// to the DEBUG() macro.  The maximum size of this structure is defined by \r
-/// EFI_STATUS_CODE_DATA_MAX_SIZE.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The debug error level passed into a DEBUG() macro.\r
-  ///\r
-  UINT32  ErrorLevel;\r
-} EFI_DEBUG_INFO;\r
-\r
-extern EFI_GUID gEfiStatusCodeDataTypeDebugGuid;\r
-\r
-#endif // _STATUS_CODE_DATA_TYPE_DEBUG_H_\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index a0d44b5dd234288020972376553a6d5aadfc7fd1..1b636b61174101e6e82f5d616cac3c5029ebe039 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -38,10 +38,6 @@
   #  Include/Guid/IntelFrameworkModulePkgTokenSpace.h\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}\r
 \r
-  ## GUID identifies status code records HOB that originate from the PEI status code\r
-  #  Include/Guid/MemoryStatusCodeRecord.h\r
-  gMemoryStatusCodeRecordGuid     = { 0x060CC026, 0x4C0D, 0x4DDA, { 0x8F, 0x41, 0x59, 0x5F, 0xEF, 0x00, 0xA5, 0x02 }}\r
-\r
   ## GUID identifies Data Hub records logged by Status Code Runtime Protocol.\r
   #  Include/Guid/DataHubStatusCodeRecord.h\r
   gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}\r
@@ -54,10 +50,6 @@
   #  Include/Guid/LzmaDecompress.h\r
   gLzmaCustomDecompressGuid      = { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }}\r
 \r
-  ## GUID used to pass DEBUG() macro information through the Status Code Protocol and Status Code PPI\r
-  #  Include/Guid/StatusCodeDataTypeDebug.h\r
-  gEfiStatusCodeDataTypeDebugGuid  = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}\r
-\r
 [Protocols]\r
   ## Vga Mini port binding for a VGA controller\r
   #  Include/Protocol/VgaMiniPort.h\r
@@ -80,22 +72,12 @@
   gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}\r
 \r
 [PcdsFeatureFlag]\r
-  ## This PCD specifies whether StatusCode is reported via Serial port.\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022\r
-\r
-  ## This PCD specifies whether StatusCode is stored in memory.\r
-  #  The memory is boot time memory in PEI Phase and is runtime memory in DXE Phase.\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023\r
-\r
   ## This PCD specifies whether StatusCode is reported via OEM device.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|FALSE|BOOLEAN|0x00010024\r
 \r
   ## This PCD specifies whether StatusCode is loged into DataHub.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE|BOOLEAN|0x00010029\r
 \r
-  ## This PCD specifies whether Peiphase StatusCode is replayed in DxePhase.\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn|FALSE|BOOLEAN|0x0001002d\r
-\r
   ## This PCD specifies whether Serial device use half hand shake.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE|BOOLEAN|0x00010043\r
 \r
@@ -112,13 +94,6 @@
   #  BIT2 indicates if ISA memory is supported\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures|0x05|UINT8|0x00010040\r
 \r
-[PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]\r
-  ## PcdStatusCodeMemorySize is used when PcdStatusCodeUseMemory is set to true\r
-  #  (PcdStatusCodeMemorySize * KBytes) is the total taken memory size.\r
-  #  The default value in PeiPhase is 1 KBytes.\r
-  #  The default value in DxePhase is 128 KBytes.\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|UINT16|0x00010025\r
-\r
 [PcdsDynamic]\r
   ## PCD is used to mark if the machine has complete one boot cycle before.\r
   #  After the complete boot, the variable BootState will be set to TRUE.\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 509db82eb407265c2de86b5377837272907fe813..96c870fbed0df34154b4587316d970540f02b783 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -136,7 +136,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE\r
 \r
 [PcdsFixedAtBuild.common]\r
@@ -159,10 +159,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0\r
 \r
 [PcdsDynamicDefault.PEIM.DEFAULT]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
 \r
 [PcdsDynamicDefault.DXE_RUNTIME_DRIVER.DEFAULT]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|4\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|4\r
 \r
 [PcdsFixedAtBuild.IPF]\r
   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000\r

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
index 20f22ae9bcea832c8dc3706a311d06f5e3bd913d..348d3e726747e4b1c9a32b9fc4629f0cc01acbdd 100644 (file)
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
@@ -33,6 +33,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
index 043a3ee1a95bbad08696d2ed89160dd93d1d92ad..28ab9de6fe4c8df2f72dcdc5c429486695138f55 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
@@ -34,6 +34,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
   \r

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
index 871a8e6f0dd03507a082a35390a03e58aae33388..8067f7a635c407721723d0d263c519da45c1eaad 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
@@ -37,6 +37,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
index 9bbfa95e2baeac80910ff4ee718e5e0113f3abdd..480cb6e5008686ac93eb2edd8a14a9a951bad929 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
@@ -12,8 +12,6 @@
 \r
 **/\r
 \r
-#include <FrameworkDxe.h>\r
-\r
 #include <Library/ReportStatusCodeLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/SmmServicesTableLib.h>\r

diff --git a/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf b/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
index 8b0e82118119a3a7d4ec2203b31f2821fb0b0912..b8ef3662ce1f19d180ff27d34371a8aaddb52acf 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
+++ b/IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
@@ -35,8 +35,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
 \r
 [LibraryClasses]\r
   PcdLib\r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
index 28a5a0f4171045fff4602890f57963f18b055aef..94f642b65a0a8009aa7c55d1c0cb5ee223364ceb 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
@@ -41,6 +41,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
index 9a79d02b075552eedde5becf4f95b4a38e46a930..3b6bb6afb2076e6a130207d2e7afef13c6c18f50 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
@@ -32,6 +32,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
index 6085cd046670fa3883324a683376765af9352e7a..606cbb599d1012d0301e024aee3b09a76343d485 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
@@ -37,6 +37,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
@@ -63,12 +64,12 @@
 \r
 [FeaturePcd.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
 \r
 \r
 [Pcd.common]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
index 69382aee011824fdff67aafe82c9cc18e587d0fc..f5619e3d081826b5e58bc667d944630d14dc622c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
@@ -40,6 +40,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
@@ -73,14 +74,14 @@
   gEfiDataHubProtocolGuid                       ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)\r
 \r
 [FeaturePcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
 \r
 [Pcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory\r
 \r
 [Depex]\r
   TRUE
\ No newline at end of file

diff --git a/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf b/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
index db4ad8f176a4f191c937de5087c11edb1aeba08a..189da71d0b8d753119200ed3fb226d197c12a863 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
@@ -35,7 +35,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
 \r
 [LibraryClasses]\r
   PeimEntryPoint\r
@@ -54,11 +54,11 @@
   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES\r
 \r
 [FeaturePcd.common]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
 \r
 [Pcd.common]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory\r
 \r
 [Depex]\r
   gEfiPeiRscHandlerPpiGuid\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf b/IntelFrameworkModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
index a69a0dc2483c9ad132b8a8e96545d36fe593010e..ec176eb0866806d71ccde00b1c096b4ef400507e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
@@ -35,7 +35,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
 \r
 [LibraryClasses]\r
   SerialPortLib\r
@@ -51,7 +51,6 @@
   SynchronizationLib\r
 \r
 [Guids]\r
-  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)\r
   gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB\r
   gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event\r
   gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event\r
@@ -60,12 +59,12 @@
   gEfiRscHandlerProtocolGuid                    ## CONSUMES\r
 \r
 [FeaturePcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
 \r
 [Pcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory\r
 \r
 [Depex]\r
   gEfiRscHandlerProtocolGuid\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf b/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
index c886d5e4bf752ac97afe2d58e2e152996cfc42e8..b0846f23d1a3016cdbdc92e43a6c6c8f2328f9f4 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
@@ -37,7 +37,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
 \r
 [LibraryClasses]\r
   SerialPortLib\r
@@ -50,18 +50,17 @@
   SynchronizationLib\r
 \r
 [Guids]\r
-  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)\r
   gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB\r
 \r
 [Protocols]\r
   gEfiSmmRscHandlerProtocolGuid                 ## CONSUMES\r
 \r
 [FeaturePcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
 \r
 [Pcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory\r
 \r
 [Depex]\r
   gEfiSmmRscHandlerProtocolGuid\r