From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: pjones@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Fri, 20 Sep 2019 11:45:09 -0700 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D45FB62C; Fri, 20 Sep 2019 18:45:09 +0000 (UTC) Received: from trillian.uncooperative.org.com (dhcp-10-20-1-15.bss.redhat.com [10.20.1.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 952A65C21E; Fri, 20 Sep 2019 18:45:08 +0000 (UTC) From: pjones@redhat.com To: devel@edk2.groups.io Cc: Laszlo Ersek , Ard Biesheuvel , Jordan Justen Subject: [edk2/master PATCHv1 1/1] OvmfPkg: Make SOURCE_DEBUG_ENABLE actually need to be set to TRUE Date: Fri, 20 Sep 2019 14:45:07 -0400 Message-Id: <20190920184507.909884-1-pjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 20 Sep 2019 18:45:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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. 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. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Peter Jones --- OvmfPkg/OvmfPkgIa32.dsc | 17 +++++++++-------- OvmfPkg/OvmfPkgIa32.fdf | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 19 ++++++++++--------- OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- OvmfPkg/OvmfPkgX64.dsc | 19 ++++++++++--------- OvmfPkg/OvmfPkgX64.fdf | 2 +- OvmfPkg/OvmfXen.dsc | 17 +++++++++-------- OvmfPkg/OvmfXen.fdf | 2 +- 8 files changed, 42 insertions(+), 38 deletions(-) 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] #=0D DEFINE SECURE_BOOT_ENABLE =3D FALSE=0D DEFINE SMM_REQUIRE =3D FALSE=0D + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D DEFINE TPM2_ENABLE =3D FALSE=0D DEFINE TPM2_CONFIG_ENABLE =3D FALSE=0D =0D @@ -157,7 +158,7 @@ [LibraryClasses] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf=0D FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDeb= ug/PeCoffExtraActionLibDebug.inf=0D DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibS= erialPort/DebugCommunicationLibSerialPort.inf=0D !else=0D @@ -225,7 +226,7 @@ [LibraryClasses.common.SEC] !endif=0D ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseE= xtractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf=0D @@ -267,7 +268,7 @@ [LibraryClasses.common.PEIM] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf=0D ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResou= rcePublicationLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf=0D @@ -292,7 +293,7 @@ [LibraryClasses.common.DXE_CORE] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf=0D !endif=0D ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf=0D @@ -351,7 +352,7 @@ [LibraryClasses.common.DXE_DRIVER] !else=0D LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf=0D !endif=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D @@ -389,7 +390,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.in= f=0D !endif=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf=0D @@ -481,7 +482,7 @@ [PcdsFixedAtBuild] # DEBUG_ERROR 0x80000000 // Error=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17=0D !else=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F=0D @@ -495,7 +496,7 @@ [PcdsFixedAtBuild] # never lets the RAM below 4 GB exceed 2816 MB.=0D gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2=0D !endif=0D =0D diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 785affeb90c8..c7622fcfb7b0 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -260,7 +260,7 @@ [FV.DXEFV] INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf=0D =0D INF OvmfPkg/SioBusDxe/SioBusDxe.inf=0D -!ifndef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) !=3D TRUE=0D INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf=0D !endif=0D INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf=0D 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] #=0D DEFINE SECURE_BOOT_ENABLE =3D FALSE=0D DEFINE SMM_REQUIRE =3D FALSE=0D + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D DEFINE TPM2_ENABLE =3D FALSE=0D DEFINE TPM2_CONFIG_ENABLE =3D FALSE=0D =0D @@ -69,7 +70,7 @@ [BuildOptions] !if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse=0D !endif=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D GCC:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D INTEL:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D @@ -162,7 +163,7 @@ [LibraryClasses] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf=0D FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDeb= ug/PeCoffExtraActionLibDebug.inf=0D DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibS= erialPort/DebugCommunicationLibSerialPort.inf=0D !else=0D @@ -230,7 +231,7 @@ [LibraryClasses.common.SEC] !endif=0D ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseE= xtractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf=0D @@ -272,7 +273,7 @@ [LibraryClasses.common.PEIM] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf=0D ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResou= rcePublicationLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf=0D @@ -297,7 +298,7 @@ [LibraryClasses.common.DXE_CORE] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf=0D !endif=0D ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf=0D @@ -356,7 +357,7 @@ [LibraryClasses.common.DXE_DRIVER] !else=0D LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf=0D !endif=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D @@ -394,7 +395,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.in= f=0D !endif=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf=0D @@ -486,7 +487,7 @@ [PcdsFixedAtBuild] # DEBUG_ERROR 0x80000000 // Error=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17=0D !else=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F=0D @@ -500,7 +501,7 @@ [PcdsFixedAtBuild] # never lets the RAM below 4 GB exceed 2816 MB.=0D gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2=0D !endif=0D =0D diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 74407072563b..9c7740eddbb8 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -261,7 +261,7 @@ [FV.DXEFV] INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf=0D =0D INF OvmfPkg/SioBusDxe/SioBusDxe.inf=0D -!ifndef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) !=3D TRUE=0D INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf=0D !endif=0D INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf=0D 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] #=0D DEFINE SECURE_BOOT_ENABLE =3D FALSE=0D DEFINE SMM_REQUIRE =3D FALSE=0D + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D DEFINE TPM2_ENABLE =3D FALSE=0D DEFINE TPM2_CONFIG_ENABLE =3D FALSE=0D =0D @@ -69,7 +70,7 @@ [BuildOptions] !if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse=0D !endif=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D GCC:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D INTEL:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D @@ -162,7 +163,7 @@ [LibraryClasses] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf=0D FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDeb= ug/PeCoffExtraActionLibDebug.inf=0D DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibS= erialPort/DebugCommunicationLibSerialPort.inf=0D !else=0D @@ -230,7 +231,7 @@ [LibraryClasses.common.SEC] !endif=0D ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseE= xtractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf=0D @@ -272,7 +273,7 @@ [LibraryClasses.common.PEIM] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf=0D ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResou= rcePublicationLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf=0D @@ -297,7 +298,7 @@ [LibraryClasses.common.DXE_CORE] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf=0D !endif=0D ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf=0D @@ -356,7 +357,7 @@ [LibraryClasses.common.DXE_DRIVER] !else=0D LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf=0D !endif=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D @@ -394,7 +395,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.in= f=0D !endif=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf=0D @@ -486,7 +487,7 @@ [PcdsFixedAtBuild] # DEBUG_ERROR 0x80000000 // Error=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17=0D !else=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F=0D @@ -500,7 +501,7 @@ [PcdsFixedAtBuild] # never lets the RAM below 4 GB exceed 2816 MB.=0D gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2=0D !endif=0D =0D diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 74407072563b..9c7740eddbb8 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -261,7 +261,7 @@ [FV.DXEFV] INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf=0D =0D INF OvmfPkg/SioBusDxe/SioBusDxe.inf=0D -!ifndef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) !=3D TRUE=0D INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf=0D !endif=0D INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf=0D 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 line.= =0D # -D FLAG=3DVALUE=0D #=0D + DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D =0D #=0D # Network definition=0D @@ -66,7 +67,7 @@ [BuildOptions] !if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse=0D !endif=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D GCC:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D INTEL:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable=0D @@ -156,7 +157,7 @@ [LibraryClasses] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf=0D FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDeb= ug/PeCoffExtraActionLibDebug.inf=0D DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibS= erialPort/DebugCommunicationLibSerialPort.inf=0D !else=0D @@ -213,7 +214,7 @@ [LibraryClasses.common.SEC] !endif=0D ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseE= xtractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf=0D @@ -255,7 +256,7 @@ [LibraryClasses.common.PEIM] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf=0D ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResou= rcePublicationLib.inf=0D ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib= .inf=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf=0D @@ -275,7 +276,7 @@ [LibraryClasses.common.DXE_CORE] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf=0D !endif=0D ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf=0D @@ -327,7 +328,7 @@ [LibraryClasses.common.DXE_DRIVER] QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf=0D LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf=0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.in= f=0D !endif=0D PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D @@ -412,7 +413,7 @@ [PcdsFixedAtBuild] # DEBUG_ERROR 0x80000000 // Error=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17=0D !else=0D gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F=0D @@ -426,7 +427,7 @@ [PcdsFixedAtBuild] # never lets the RAM below 4 GB exceed 2816 MB.=0D gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000=0D =0D -!ifdef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE=0D gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2=0D !endif=0D =0D diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index e6e9e184ef04..6834d3aa39b9 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -343,7 +343,7 @@ [FV.DXEFV] INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf=0D =0D INF OvmfPkg/SioBusDxe/SioBusDxe.inf=0D -!ifndef $(SOURCE_DEBUG_ENABLE)=0D +!if $(SOURCE_DEBUG_ENABLE) !=3D TRUE=0D INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf=0D !endif=0D INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf=0D --=20 2.23.0