Retire the duplicate StatusCode PCD:

gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial, PcdStatusCodeUseHardSerial, PcdStatusCodeUseRuntimeMemory, PcdStatusCodeReplayInSerial, PcdStatusCodeReplayInRuntimeMemory, PcdStatusCodeReplayInDataHub, PcdStatusCodeReplayInOEM, PcdStatusCodeRuntimeMemorySize

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

IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

@@ -115,41 +115,53 @@
   gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}
 
 [PcdsFeatureFlag]
-  ## if required, only one mask PCD to support all features to reduces PCD number.
+  ## This PCD specifies whether StatusCode is reported to Serial port.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022
+
+  ## This PCD specifies whether StatusCode is stored in memory.
+  #  Pei Phase Memory is boot time memory. Dxe Phase memory is runtime memory.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023
+
+  ## This PCD specifies whether StatusCode is reported to OEM device.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|FALSE|BOOLEAN|0x00010024
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE|BOOLEAN|0x00010026
+
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|TRUE|BOOLEAN|0x00010027
+  ## This PCD specifies whether StatusCode is loged into DataHub.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE|BOOLEAN|0x00010028
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE|BOOLEAN|0x00010029
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE|BOOLEAN|0x0001002a
+
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE|BOOLEAN|0x0001002b
+  ## This PCD specifies whether Peiphase StatusCode is replayed in DxePhase.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE|BOOLEAN|0x0001002c
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn|FALSE|BOOLEAN|0x0001002d
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE|BOOLEAN|0x0001002d
   
   ## 
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable|FALSE|BOOLEAN|0x00010039
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciVgaEnable|FALSE|BOOLEAN|0x0001003a
+  
+  ## This PCD specifies whether PciBus supports the hot plug device.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport|TRUE|BOOLEAN|0x0001003d
   
-  ## 
+  ## ISA bus related PCD can be merged into one.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportDma|TRUE|BOOLEAN|0x00010040
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusOnlySupportSlaveDma|FALSE|BOOLEAN|0x00010041
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory|TRUE|BOOLEAN|0x00010042
 
 [PcdsFixedAtBuild]
+  ## PCD marks PCI support incompatible operations: AcpiResource, Read, Write, RegisterUpdate, AccessWidth.
+  #  BIT0:AcpiResource, BIT1:Read, BIT2:Write, BIT3:RegisterUpdate, BIT4:AccessWidth
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask|0|UINT8|0x0001003f
 
 [PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]
+  ## PcdStatusCodeMemorySize is used when PcdStatusCodeUseMemory is set to true
+  #  (PcdStatusCodeMemorySize * KBytes) is the total taken memory size.
+  #  The default value in PeiPhase is 1 KBytes.
+  #  The default value in DxePhase is 128 KBytes.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|UINT16|0x00010025
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128|UINT16|0x0001002e
 
 [PcdsDynamic]
+  ## PCD is used to mark if the machine has complete one boot cycle before.
+  #  After the complete boot, the variable BootState will be set to TRUE. 
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|TRUE|BOOLEAN|0x0001002f
   
   ## Timeout value for displaying progressing bar in before boot OS.
-  #  According to UEFI 2.0 spec, it should treat the Timeout value as 0xffff.
+  #  According to UEFI 2.0 spec, the default TimeOut should be 0xffff.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0xffff|UINT16|0x40000001
 
   ## Error level for hardware recorder. If value 0, platform does not support feature of hardware error record.

IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc

@@ -132,16 +132,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciVgaEnable|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport|TRUE
@@ -169,10 +159,11 @@
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0
 
-
+[PcdsDynamicDefault.PEIM.DEFAULT]
-[PcdsDynamicDefault.common.DEFAULT]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|4
+
+[PcdsDynamicDefault.DXE_RUNTIME_DRIVER.DEFAULT]
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|4
 
 [PcdsFixedAtBuild.IPF]
   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000

IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

@@ -68,7 +68,7 @@
 
 
 [Pcd.common]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory
 
 [Depex]
   TRUE

IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c

@@ -32,15 +32,14 @@ RtMemoryStatusCodeInitializeWorker (
   //
   mRtMemoryStatusCodeTable = AllocateRuntimePool (
                                sizeof (RUNTIME_MEMORY_STATUSCODE_HEADER) +
-                               PcdGet16 (PcdStatusCodeRuntimeMemorySize) *
+                               PcdGet16 (PcdStatusCodeMemorySize) * 1024
-                               1024
                                );
   ASSERT (mRtMemoryStatusCodeTable != NULL);
 
   mRtMemoryStatusCodeTable->RecordIndex      = 0;
   mRtMemoryStatusCodeTable->NumberOfRecords  = 0;
   mRtMemoryStatusCodeTable->MaxRecordsNumber = 
-    (PcdGet16 (PcdStatusCodeRuntimeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);
+    (PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);
 
   return EFI_SUCCESS;
 }

IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c

@@ -14,33 +14,6 @@
 
 #include "StatusCodeRuntimeDxe.h"
 
-EFI_SERIAL_IO_PROTOCOL *mSerialIoProtocol;
-
-/**
-  Locates Serial I/O Protocol as initialization for serial status code worker.
- 
-  @retval EFI_SUCCESS  Serial I/O Protocol is successfully located.
-
-**/
-EFI_STATUS
-EfiSerialStatusCodeInitializeWorker (
-  VOID
-  )
-{
-  EFI_STATUS Status;
-
-  Status = gBS->LocateProtocol (
-             &gEfiSerialIoProtocolGuid,
-             NULL,
-             (VOID **) &mSerialIoProtocol
-             );
-
-  ASSERT_EFI_ERROR (Status);
-
-  return EFI_SUCCESS;
-}
-
-
 /**
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.
  
@@ -78,15 +51,6 @@ SerialStatusCodeReportWorker (
   UINTN           CharCount;
   BASE_LIST       Marker;
 
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {
-    if (EfiAtRuntime ()) {
-      return EFI_DEVICE_ERROR;
-    }
-    if (EfiGetCurrentTpl () > TPL_CALLBACK ) {
-      return EFI_DEVICE_ERROR;
-    }
-  }
-
   Buffer[0] = '\0';
 
   if (Data != NULL &&
@@ -174,20 +138,10 @@ SerialStatusCodeReportWorker (
                   );
   }
 
-
-  if (FeaturePcdGet (PcdStatusCodeUseHardSerial)) {
   //
   // Call SerialPort Lib function to do print.
   //
   SerialPortWrite ((UINT8 *) Buffer, CharCount);
-  }
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {
-    mSerialIoProtocol->Write (
-      mSerialIoProtocol,
-      &CharCount,
-      Buffer
-      );
-  }
 
   return EFI_SUCCESS;
 }

IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c

@@ -119,7 +119,7 @@ ReportDispatcher (
     return EFI_DEVICE_ERROR;
   }
 
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial) || FeaturePcdGet (PcdStatusCodeUseHardSerial)) {
+  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {
     SerialStatusCodeReportWorker (
       CodeType,
       Value,
@@ -128,7 +128,7 @@ ReportDispatcher (
       Data
       );
   }
-  if (FeaturePcdGet (PcdStatusCodeUseRuntimeMemory)) {
+  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {
     RtMemoryStatusCodeReportWorker (
       CodeType,
       Value,
@@ -214,18 +214,14 @@ InitializationDispatcherWorker (
   // if enable UseRuntimeMemory, then initialize runtime memory status code worker.
   // if enable UseDataHub, then initialize data hub status code worker.
   //
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {
+  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {
-    Status = EfiSerialStatusCodeInitializeWorker ();
-    ASSERT_EFI_ERROR (Status);
-  }
-  if (FeaturePcdGet (PcdStatusCodeUseHardSerial)) {
     //
     // Call Serial Port Lib API to initialize serial port.
     //
     Status = SerialPortInitialize ();
     ASSERT_EFI_ERROR (Status);
   }
-  if (FeaturePcdGet (PcdStatusCodeUseRuntimeMemory)) {
+  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {
     Status = RtMemoryStatusCodeInitializeWorker ();
     ASSERT_EFI_ERROR (Status);
   }
@@ -244,7 +240,7 @@ InitializationDispatcherWorker (
   //
   // Replay Status code which saved in GUID'ed HOB to all supported devices. 
   //
-
+  if (FeaturePcdGet (PcdStatusCodeReplayIn)) {
     // 
     // Journal GUID'ed HOBs to find all record entry, if found, 
     // then output record to support replay device.
@@ -260,9 +256,7 @@ InitializationDispatcherWorker (
           //
           // Dispatch records to devices based on feature flag.
           //
-        if (FeaturePcdGet (PcdStatusCodeReplayInSerial) && 
+          if (FeaturePcdGet (PcdStatusCodeUseSerial)) {
-            (FeaturePcdGet (PcdStatusCodeUseHardSerial) ||
-             FeaturePcdGet (PcdStatusCodeUseEfiSerial))) {
             SerialStatusCodeReportWorker (
               Record[Index].CodeType,
               Record[Index].Value,
@@ -271,16 +265,14 @@ InitializationDispatcherWorker (
               NULL
               );
           }
-        if (FeaturePcdGet (PcdStatusCodeReplayInRuntimeMemory) &&
+          if (FeaturePcdGet (PcdStatusCodeUseMemory)) {
-            FeaturePcdGet (PcdStatusCodeUseRuntimeMemory)) {
             RtMemoryStatusCodeReportWorker (
               Record[Index].CodeType,
               Record[Index].Value,
               Record[Index].Instance
               );
           }
-        if (FeaturePcdGet (PcdStatusCodeReplayInDataHub) &&
+          if (FeaturePcdGet (PcdStatusCodeUseDataHub)) {
-            FeaturePcdGet (PcdStatusCodeUseDataHub)) {
             DataHubStatusCodeReportWorker (
               Record[Index].CodeType,
               Record[Index].Value,
@@ -289,8 +281,7 @@ InitializationDispatcherWorker (
               NULL
               );
           }
-        if (FeaturePcdGet (PcdStatusCodeReplayInOEM) &&
+          if (FeaturePcdGet (PcdStatusCodeUseOEM)) {
-            FeaturePcdGet (PcdStatusCodeUseOEM)) {
             //
             // Call OEM hook status code library API to report status code to OEM device
             //
@@ -322,4 +313,5 @@ InitializationDispatcherWorker (
   
       Hob.Raw = GetNextGuidHob (&gMemoryStatusCodeRecordGuid, Hob.Raw);
     }
+  }
 }

IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

@@ -71,23 +71,16 @@
 [Protocols]
   gEfiStatusCodeRuntimeProtocolGuid             ## PRODUCES
   gEfiDataHubProtocolGuid                       ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)
-  gEfiSerialIoProtocolGuid                      ## SOMETIMES_CONSUMES (Needed if Serial is supported for status code.)
 
-
+[FeaturePcd]
-[FeaturePcd.common]
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial
 
-
+[Pcd]
-[Pcd.common]
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize
 
 [Depex]
   TRUE

Nt32Pkg/Nt32Pkg.dsc

@@ -240,9 +240,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|TRUE
 
 [PcdsFixedAtBuild.IA32]
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize|0x20000
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|12
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Nt32.fd"|VOID*|52
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1
@@ -300,18 +297,8 @@
 
 [PcdsFeatureFlag.IA32]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE

UnixPkg/UnixPkg.dsc

@@ -221,9 +221,6 @@
 #
 ################################################################################
 [PcdsFixedAtBuild.IA32]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128
-
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase|0x280000
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwSpareBase|0x290000
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|0x28e000
@@ -312,21 +309,11 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|TRUE
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE