From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.1833.1571705988124551016 for ; Mon, 21 Oct 2019 17:59:48 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: jordan.l.justen@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Oct 2019 17:59:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,325,1566889200"; d="scan'208";a="222643030" Received: from kchen12-mobl1.amr.corp.intel.com (HELO localhost) ([10.251.159.142]) by fmsmga004.fm.intel.com with ESMTP; 21 Oct 2019 17:59:47 -0700 MIME-Version: 1.0 In-Reply-To: <20191021201320.24413-1-lersek@redhat.com> References: <20191021201320.24413-1-lersek@redhat.com> Subject: Re: [PATCH v2] OvmfPkg: Make SOURCE_DEBUG_ENABLE actually need to be set to TRUE Cc: Andrew Fish , Anthony Perard , Ard Biesheuvel , Julien Grall , Leif Lindholm , Michael Kinney , Peter Jones To: Laszlo Ersek , edk2-devel-groups-io From: "Jordan Justen" Message-ID: <157170598695.14133.15735581524229848374@jljusten-skl> User-Agent: alot/0.8 Date: Mon, 21 Oct 2019 17:59:47 -0700 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jordan Justen On 2019-10-21 13:13:20, Laszlo Ersek wrote: > From: Peter Jones >=20 > Currently some tests check the value of SOURCE_DEBUG_ENABLE, and some > tests check if it's defined or not. Additionally, in UefiPayloadPkg as > well as some other trees, we define it as FALSE in the .dsc file. >=20 > This patch changes all of the Ovmf platforms to explicitly define it as > FALSE by default, and changes all of the checks to test if the value is > TRUE. >=20 > Signed-off-by: Peter Jones > Message-Id: <20190920184507.909884-1-pjones@redhat.com> > [lersek@redhat.com: drop Contributed-under line, per TianoCore BZ#1373] > [lersek@redhat.com: replace "!=3D TRUE" with more idiomatic "=3D=3D FALSE= "] > Cc: Andrew Fish > Cc: Anthony Perard > Cc: Ard Biesheuvel > Cc: Jordan Justen > Cc: Julien Grall > Cc: Leif Lindholm > Cc: Michael Kinney > Cc: Peter Jones > Signed-off-by: Laszlo Ersek > --- >=20 > Notes: > v2: > =20 > - repo: https://github.com/lersek/edk2.git > branch: src_dbg_true_v2 > =20 > - repost the patch in Peter's stead, with the updates requested at > > =20 > - per discussion with the other stewards, it's OK to explicitly resub= mit > the patch (noting the original authorship) with the Contributed-und= er > line removed >=20 > OvmfPkg/OvmfPkgIa32.dsc | 17 +++++++++-------- > OvmfPkg/OvmfPkgIa32X64.dsc | 19 ++++++++++--------- > OvmfPkg/OvmfPkgX64.dsc | 19 ++++++++++--------- > OvmfPkg/OvmfXen.dsc | 17 +++++++++-------- > OvmfPkg/OvmfPkgIa32.fdf | 2 +- > OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- > OvmfPkg/OvmfPkgX64.fdf | 2 +- > OvmfPkg/OvmfXen.fdf | 2 +- > 8 files changed, 42 insertions(+), 38 deletions(-) >=20 > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 66e944436a69..4301e7821902 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -30,6 +30,7 @@ [Defines] > # > DEFINE SECURE_BOOT_ENABLE =3D FALSE > DEFINE SMM_REQUIRE =3D FALSE > + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE > DEFINE TPM2_ENABLE =3D FALSE > DEFINE TPM2_CONFIG_ENABLE =3D FALSE > =20 > @@ -157,7 +158,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customi= zedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBl= tLib.inf > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibD= ebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLi= bSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -225,7 +226,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRep= ortStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/Bas= eExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -267,7 +268,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiRes= ourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCp= uExceptionHandlerLib.inf > @@ -292,7 +293,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort= .inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCp= uExceptionHandlerLib.inf > @@ -351,7 +352,7 @@ [LibraryClasses.common.DXE_DRIVER] > !else > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -389,7 +390,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort= .inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCp= uExceptionHandlerLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.= inf > !endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > @@ -481,7 +482,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -495,7 +496,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > =20 > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 51c2bfb44f14..803fd74ae8e4 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -30,6 +30,7 @@ [Defines] > # > DEFINE SECURE_BOOT_ENABLE =3D FALSE > DEFINE SMM_REQUIRE =3D FALSE > + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE > DEFINE TPM2_ENABLE =3D FALSE > DEFINE TPM2_CONFIG_ENABLE =3D FALSE > =20 > @@ -69,7 +70,7 @@ [BuildOptions] > !if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > GCC:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > INTEL:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > @@ -162,7 +163,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customi= zedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBl= tLib.inf > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibD= ebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLi= bSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -230,7 +231,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRep= ortStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/Bas= eExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -272,7 +273,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiRes= ourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCp= uExceptionHandlerLib.inf > @@ -297,7 +298,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort= .inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCp= uExceptionHandlerLib.inf > @@ -356,7 +357,7 @@ [LibraryClasses.common.DXE_DRIVER] > !else > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -394,7 +395,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort= .inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCp= uExceptionHandlerLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.= inf > !endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > @@ -486,7 +487,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -500,7 +501,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > =20 > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index ba7a75884490..5dbd1b793a90 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -30,6 +30,7 @@ [Defines] > # > DEFINE SECURE_BOOT_ENABLE =3D FALSE > DEFINE SMM_REQUIRE =3D FALSE > + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE > DEFINE TPM2_ENABLE =3D FALSE > DEFINE TPM2_CONFIG_ENABLE =3D FALSE > =20 > @@ -69,7 +70,7 @@ [BuildOptions] > !if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > GCC:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > INTEL:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > @@ -162,7 +163,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customi= zedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBl= tLib.inf > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibD= ebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLi= bSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -230,7 +231,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRep= ortStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/Bas= eExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -272,7 +273,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiRes= ourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCp= uExceptionHandlerLib.inf > @@ -297,7 +298,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort= .inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCp= uExceptionHandlerLib.inf > @@ -356,7 +357,7 @@ [LibraryClasses.common.DXE_DRIVER] > !else > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -394,7 +395,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort= .inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCp= uExceptionHandlerLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.= inf > !endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > @@ -486,7 +487,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -500,7 +501,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > =20 > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc > index 5a31f75f05d0..8c11efe9b709 100644 > --- a/OvmfPkg/OvmfXen.dsc > +++ b/OvmfPkg/OvmfXen.dsc > @@ -29,6 +29,7 @@ [Defines] > # Defines for default states. These can be changed on the command lin= e. > # -D FLAG=3DVALUE > # > + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE > =20 > # > # Network definition > @@ -66,7 +67,7 @@ [BuildOptions] > !if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse > !endif > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > GCC:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > INTEL:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable > @@ -156,7 +157,7 @@ [LibraryClasses] > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customi= zedDisplayLib.inf > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBl= tLib.inf > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibD= ebug/PeCoffExtraActionLibDebug.inf > DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLi= bSerialPort/DebugCommunicationLibSerialPort.inf > !else > @@ -213,7 +214,7 @@ [LibraryClasses.common.SEC] > !endif > ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRep= ortStatusCodeLib.inf > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/Bas= eExtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -255,7 +256,7 @@ [LibraryClasses.common.PEIM] > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiRes= ourcePublicationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentL= ib.inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCp= uExceptionHandlerLib.inf > @@ -275,7 +276,7 @@ [LibraryClasses.common.DXE_CORE] > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort= .inf > !endif > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeE= xtractGuidedSectionLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCp= uExceptionHandlerLib.inf > @@ -327,7 +328,7 @@ [LibraryClasses.common.DXE_DRIVER] > QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCp= uExceptionHandlerLib.inf > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.= inf > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > @@ -412,7 +413,7 @@ [PcdsFixedAtBuild] > # DEBUG_ERROR 0x80000000 // Error > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 > !else > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F > @@ -426,7 +427,7 @@ [PcdsFixedAtBuild] > # never lets the RAM below 4 GB exceed 2816 MB. > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000 > =20 > -!ifdef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > =20 > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 785affeb90c8..586bbff08585 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -260,7 +260,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestD= xe.inf > =20 > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 74407072563b..e49adc425fce 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -261,7 +261,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestD= xe.inf > =20 > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 74407072563b..e49adc425fce 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -261,7 +261,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestD= xe.inf > =20 > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf > index e6e9e184ef04..05138ffc5b4f 100644 > --- a/OvmfPkg/OvmfXen.fdf > +++ b/OvmfPkg/OvmfXen.fdf > @@ -343,7 +343,7 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestD= xe.inf > =20 > INF OvmfPkg/SioBusDxe/SioBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > +!if $(SOURCE_DEBUG_ENABLE) =3D=3D FALSE > INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > --=20 > 2.19.1.3.g30247aa5d201 >=20