From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web12.27691.1591614968761007288 for ; Mon, 08 Jun 2020 04:16:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: ming.tan@intel.com) IronPort-SDR: gBov+wOzOeKx1nsTd2MFRMAlzIJu+Xm8P4sM7Yb6rew7ieYVeIebj8RrDZEiYHNu9dAkzIrEaj JLrCRmaw4d0Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2020 04:16:07 -0700 IronPort-SDR: bXKcIwfIcQXHTCSbqaesNnZF419pWOTD4fcim3jgchCu0vkjmdJzshj6dhyu7g3E1Xb1PSCXkj GdEL23mLhl+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,487,1583222400"; d="scan'208";a="349136017" Received: from shwdejointlab96.ccr.corp.intel.com ([10.239.134.144]) by orsmga001.jf.intel.com with ESMTP; 08 Jun 2020 04:16:06 -0700 From: "Tan, Ming" To: devel@edk2.groups.io Subject: [PATCH 2/2] MdeModulePkg.dec: Change PCDs for status code. Date: Mon, 8 Jun 2020 19:15:47 +0800 Message-Id: <20200608111547.17649-2-ming.tan@intel.com> X-Mailer: git-send-email 2.24.0.windows.2 In-Reply-To: <20200608111547.17649-1-ming.tan@intel.com> References: <20200608111547.17649-1-ming.tan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2786 In order to support enable/disable report status code through memory and serial dynamic, change the following PCDs from PcdsFeatureFlag to PcdsDynamic: PcdStatusCodeUseSerial PcdStatusCodeUseMemory Signed-off-by: Ming Tan --- EmulatorPkg/EmulatorPkg.dsc | 4 +-- MdeModulePkg/MdeModulePkg.dec | 27 ++++++++++--------- .../Pei/StatusCodeHandlerPei.c | 6 ++--- .../Pei/StatusCodeHandlerPei.inf | 6 ++--- .../RuntimeDxe/StatusCodeHandlerRuntimeDxe.c | 16 +++++------ .../StatusCodeHandlerRuntimeDxe.inf | 6 ++--- .../Smm/StatusCodeHandlerSmm.c | 10 +++---- .../Smm/StatusCodeHandlerSmm.inf | 6 ++--- OvmfPkg/OvmfPkgIa32.dsc | 8 +++--- OvmfPkg/OvmfPkgIa32X64.dsc | 8 +++--- OvmfPkg/OvmfPkgX64.dsc | 8 +++--- OvmfPkg/OvmfXen.dsc | 8 +++--- UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 16 ++++++----- UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 16 ++++++----- 14 files changed, 76 insertions(+), 69 deletions(-) diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 1fc924ae5a..aa4ab9b206 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -4,7 +4,7 @@ # The Emulation Platform can be used to debug individual modules, prior to= creating=0D # a real platform. This also provides an example for how an DSC is created= .=0D #=0D -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
=0D # Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.
= =0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -174,7 +174,6 @@ =0D [PcdsFeatureFlag]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst= |FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables|FALSE=0D =0D @@ -229,6 +228,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE=0D =0D [PcdsDynamicHii.common.DEFAULT]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"Setup"|gEmuSystemConfig= Guid|0x0|80=0D diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 4f44af6948..60f390e41a 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -760,19 +760,6 @@ # @Prompt Enable PCI bridge IO alignment probe.=0D gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe|FALSE|BOOLEA= N|0x0001004e=0D =0D - ## Indicates if StatusCode is reported via Serial port.

=0D - # TRUE - Reports StatusCode via Serial port.
=0D - # FALSE - Does not report StatusCode via Serial port.
=0D - # @Prompt Enable StatusCode via Serial port.=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x000= 10022=0D -=0D - ## Indicates if StatusCode is stored in memory.=0D - # The memory is boot time memory in PEI Phase and is runtime memory in = DXE Phase.

=0D - # TRUE - Stores StatusCode in memory.
=0D - # FALSE - Does not store StatusCode in memory.
=0D - # @Prompt Enable StatusCode via memory.=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00= 010023=0D -=0D ## Indicates if PEI phase StatusCode will be replayed in DXE phase.
<= BR>=0D # TRUE - Replays PEI phase StatusCode in DXE phased.
=0D # FALSE - Does not replay PEI phase StatusCode in DXE phase.
=0D @@ -877,6 +864,20 @@ # @Prompt Enable process non-reset capsule image at runtime.=0D gEfiMdeModulePkgTokenSpaceGuid.PcdSupportProcessCapsuleAtRuntime|FALSE|B= OOLEAN|0x00010079=0D =0D +[PcdsDynamic]=0D + ## Indicates if StatusCode is reported via Serial port.

=0D + # TRUE - Reports StatusCode via Serial port.
=0D + # FALSE - Does not report StatusCode via Serial port.
=0D + # @Prompt Enable StatusCode via Serial port.=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x000= 10022=0D +=0D + ## Indicates if StatusCode is stored in memory.=0D + # The memory is boot time memory in PEI Phase and is runtime memory in = DXE Phase.

=0D + # TRUE - Stores StatusCode in memory.
=0D + # FALSE - Does not store StatusCode in memory.
=0D + # @Prompt Enable StatusCode via memory.=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00= 010023=0D +=0D [PcdsFeatureFlag.IA32, PcdsFeatureFlag.ARM, PcdsFeatureFlag.AARCH64]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdPciDegradeResourceForOptionRom|FALSE|B= OOLEAN|0x0001003a=0D =0D diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandler= Pei.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c index 1b07f92f3c..9b2ea4ee84 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c @@ -2,7 +2,7 @@ Report Status Code Handler PEIM which produces general handlers and hook= them=0D onto the PEI status code router.=0D =0D - Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -45,13 +45,13 @@ StatusCodeHandlerPeiEntry ( // If enable UseSerial, then initialize serial port.=0D // if enable UseMemory, then initialize memory status code worker.=0D //=0D - if (FeaturePcdGet (PcdStatusCodeUseSerial)) {=0D + if (PcdGetBool (PcdStatusCodeUseSerial)) {=0D Status =3D SerialPortInitialize();=0D ASSERT_EFI_ERROR (Status);=0D Status =3D RscHandlerPpi->Register (SerialStatusCodeReportWorker);=0D ASSERT_EFI_ERROR (Status);=0D }=0D - if (FeaturePcdGet (PcdStatusCodeUseMemory)) {=0D + if (PcdGetBool (PcdStatusCodeUseMemory)) {=0D Status =3D MemoryStatusCodeInitializeWorker ();=0D ASSERT_EFI_ERROR (Status);=0D Status =3D RscHandlerPpi->Register (MemoryStatusCodeReportWorker);=0D diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandler= Pei.inf b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei= .inf index 8aef9af34a..64380ddfac 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf +++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf @@ -53,11 +53,9 @@ [Ppis]=0D gEfiPeiRscHandlerPpiGuid ## CONSUMES=0D =0D -[FeaturePcd]=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES=0D -=0D [Pcd]=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePk= gTokenSpaceGuid.PcdStatusCodeUseMemory ## SOMETIMES_CONSUMES=0D =0D [Depex]=0D diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCode= HandlerRuntimeDxe.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/S= tatusCodeHandlerRuntimeDxe.c index 79cc48fa55..a8c0fe5b71 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler= RuntimeDxe.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler= RuntimeDxe.c @@ -2,7 +2,7 @@ Status Code Handler Driver which produces general handlers and hook them= =0D onto the DXE status code router.=0D =0D - Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -29,7 +29,7 @@ UnregisterBootTimeHandlers ( IN VOID *Context=0D )=0D {=0D - if (FeaturePcdGet (PcdStatusCodeUseSerial)) {=0D + if (PcdGetBool (PcdStatusCodeUseSerial)) {=0D mRscHandlerProtocol->Unregister (SerialStatusCodeReportWorker);=0D }=0D }=0D @@ -80,14 +80,14 @@ InitializationDispatcherWorker ( // If enable UseSerial, then initialize serial port.=0D // if enable UseRuntimeMemory, then initialize runtime memory status cod= e worker.=0D //=0D - if (FeaturePcdGet (PcdStatusCodeUseSerial)) {=0D + if (PcdGetBool (PcdStatusCodeUseSerial)) {=0D //=0D // Call Serial Port Lib API to initialize serial port.=0D //=0D Status =3D SerialPortInitialize ();=0D ASSERT_EFI_ERROR (Status);=0D }=0D - if (FeaturePcdGet (PcdStatusCodeUseMemory)) {=0D + if (PcdGetBool (PcdStatusCodeUseMemory)) {=0D Status =3D RtMemoryStatusCodeInitializeWorker ();=0D ASSERT_EFI_ERROR (Status);=0D }=0D @@ -115,7 +115,7 @@ InitializationDispatcherWorker ( //=0D // Dispatch records to devices based on feature flag.=0D //=0D - if (FeaturePcdGet (PcdStatusCodeUseSerial)) {=0D + if (PcdGetBool (PcdStatusCodeUseSerial)) {=0D SerialStatusCodeReportWorker (=0D Record[Index].CodeType,=0D Record[Index].Value,=0D @@ -124,7 +124,7 @@ InitializationDispatcherWorker ( NULL=0D );=0D }=0D - if (FeaturePcdGet (PcdStatusCodeUseMemory)) {=0D + if (PcdGetBool (PcdStatusCodeUseMemory)) {=0D RtMemoryStatusCodeReportWorker (=0D Record[Index].CodeType,=0D Record[Index].Value,=0D @@ -171,10 +171,10 @@ StatusCodeHandlerRuntimeDxeEntry ( //=0D InitializationDispatcherWorker ();=0D =0D - if (FeaturePcdGet (PcdStatusCodeUseSerial)) {=0D + if (PcdGetBool (PcdStatusCodeUseSerial)) {=0D mRscHandlerProtocol->Register (SerialStatusCodeReportWorker, TPL_HIGH_= LEVEL);=0D }=0D - if (FeaturePcdGet (PcdStatusCodeUseMemory)) {=0D + if (PcdGetBool (PcdStatusCodeUseMemory)) {=0D mRscHandlerProtocol->Register (RtMemoryStatusCodeReportWorker, TPL_HIG= H_LEVEL);=0D }=0D =0D diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCode= HandlerRuntimeDxe.inf b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe= /StatusCodeHandlerRuntimeDxe.inf index d74c2a55dc..faadfd9578 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler= RuntimeDxe.inf +++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandler= RuntimeDxe.inf @@ -58,12 +58,10 @@ [Protocols]=0D gEfiRscHandlerProtocolGuid ## CONSUMES=0D =0D -[FeaturePcd]=0D +[Pcd]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn ## CONSUMES=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES=0D -=0D -[Pcd]=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModu= lePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## SOMETIMES_CONSUMES=0D =0D [Depex]=0D diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandler= Smm.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c index f54991ed3f..20271571de 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c @@ -2,7 +2,7 @@ Status Code Handler Driver which produces general handlers and hook them= =0D onto the SMM status code router.=0D =0D - Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -28,14 +28,14 @@ InitializationDispatcherWorker ( // If enable UseSerial, then initialize serial port.=0D // if enable UseRuntimeMemory, then initialize runtime memory status cod= e worker.=0D //=0D - if (FeaturePcdGet (PcdStatusCodeUseSerial)) {=0D + if (PcdGetBool (PcdStatusCodeUseSerial)) {=0D //=0D // Call Serial Port Lib API to initialize serial port.=0D //=0D Status =3D SerialPortInitialize ();=0D ASSERT_EFI_ERROR (Status);=0D }=0D - if (FeaturePcdGet (PcdStatusCodeUseMemory)) {=0D + if (PcdGetBool (PcdStatusCodeUseMemory)) {=0D Status =3D MemoryStatusCodeInitializeWorker ();=0D ASSERT_EFI_ERROR (Status);=0D }=0D @@ -73,10 +73,10 @@ StatusCodeHandlerSmmEntry ( //=0D InitializationDispatcherWorker ();=0D =0D - if (FeaturePcdGet (PcdStatusCodeUseSerial)) {=0D + if (PcdGetBool (PcdStatusCodeUseSerial)) {=0D mRscHandlerProtocol->Register (SerialStatusCodeReportWorker);=0D }=0D - if (FeaturePcdGet (PcdStatusCodeUseMemory)) {=0D + if (PcdGetBool (PcdStatusCodeUseMemory)) {=0D mRscHandlerProtocol->Register (MemoryStatusCodeReportWorker);=0D }=0D =0D diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandler= Smm.inf b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm= .inf index 47d0545f95..4e24d87e55 100644 --- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf +++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf @@ -53,11 +53,9 @@ [Protocols]=0D gEfiSmmRscHandlerProtocolGuid ## CONSUMES=0D =0D -[FeaturePcd]=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES=0D -=0D [Pcd]=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModu= lePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## SOMETIMES_CONSUMES=0D =0D [Depex]=0D diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index d0df9cbbfb..4b9146f72e 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -1,7 +1,7 @@ ## @file=0D # EFI/Framework Open Virtual Machine Firmware (OVMF) platform=0D #=0D -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
= =0D +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
= =0D # (C) Copyright 2016 Hewlett Packard Enterprise Development LP
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -449,8 +449,6 @@ ##########################################################################= ######=0D [PcdsFeatureFlag]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE=0D @@ -626,6 +624,10 @@ gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01=0D gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01=0D =0D + # Status Code support.=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D +=0D [PcdsDynamicHii]=0D !if $(TPM_ENABLE) =3D=3D TRUE && $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_= VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS=0D diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index b3ae62fee9..81f95fba28 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -1,7 +1,7 @@ ## @file=0D # EFI/Framework Open Virtual Machine Firmware (OVMF) platform=0D #=0D -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
= =0D +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
= =0D # (C) Copyright 2016 Hewlett Packard Enterprise Development LP
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -453,8 +453,6 @@ ##########################################################################= ######=0D [PcdsFeatureFlag]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE=0D @@ -634,6 +632,10 @@ gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00= , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}=0D !endif=0D =0D + # Status Code support.=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D +=0D [PcdsDynamicDefault.X64]=0D # IPv4 and IPv6 PXE Boot support.=0D gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01=0D diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index f7fe75ebf5..1476a3f38b 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -1,7 +1,7 @@ ## @file=0D # EFI/Framework Open Virtual Machine Firmware (OVMF) platform=0D #=0D -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
= =0D +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
= =0D # (C) Copyright 2016 Hewlett Packard Enterprise Development LP
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -453,8 +453,6 @@ ##########################################################################= ######=0D [PcdsFeatureFlag]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE=0D @@ -636,6 +634,10 @@ gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01=0D gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01=0D =0D + # Status Code support.=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D +=0D [PcdsDynamicHii]=0D !if $(TPM_ENABLE) =3D=3D TRUE && $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_= VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS=0D diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 3af0ee7054..14b005038a 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -1,7 +1,7 @@ ## @file=0D # EFI/Framework Open Virtual Machine Firmware (OVMF) platform=0D #=0D -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
= =0D +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
= =0D # (C) Copyright 2016 Hewlett Packard Enterprise Development LP
=0D # Copyright (c) 2019, Citrix Systems, Inc.=0D #=0D @@ -334,8 +334,6 @@ ##########################################################################= ######=0D [PcdsFeatureFlag]=0D gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE=0D @@ -474,6 +472,10 @@ =0D gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00=0D =0D + # Status Code support.=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE=0D +=0D ##########################################################################= ######=0D #=0D # Components Section - list of all EDK II Modules needed by this Platform.= =0D diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPay= loadPkgIa32.dsc index d52945442e..6ea948d71c 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc @@ -3,7 +3,7 @@ #=0D # Provides drivers and definitions to create uefi payload for bootloaders.= =0D #=0D -# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.
=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D ##=0D @@ -264,12 +264,6 @@ #=0D ##########################################################################= ######=0D [PcdsFeatureFlag]=0D -!if $(TARGET) =3D=3D DEBUG=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE=0D -!else=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D -!endif=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE=0D @@ -358,6 +352,14 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100=0D =0D + # Status Code support.=0D +!if $(TARGET) =3D=3D DEBUG=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE=0D +!else=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D +!endif=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE=0D +=0D ##########################################################################= ######=0D #=0D # Components Section - list of all EDK II Modules needed by this Platform.= =0D diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/Uefi= PayloadPkgIa32X64.dsc index 0736cd9954..7c61356a87 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc @@ -3,7 +3,7 @@ #=0D # Provides drivers and definitions to create uefi payload for bootloaders.= =0D #=0D -# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.
=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D ##=0D @@ -265,12 +265,6 @@ #=0D ##########################################################################= ######=0D [PcdsFeatureFlag]=0D -!if $(TARGET) =3D=3D DEBUG=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE=0D -!else=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D -!endif=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE=0D @@ -360,6 +354,14 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100=0D =0D + # Status Code support.=0D +!if $(TARGET) =3D=3D DEBUG=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE=0D +!else=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE=0D +!endif=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE=0D +=0D ##########################################################################= ######=0D #=0D # Components Section - list of all EDK II Modules needed by this Platform.= =0D --=20 2.24.0.windows.2