From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=zailiang.sun@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8EC9C21959CB2 for ; Tue, 19 Mar 2019 20:11:52 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Mar 2019 20:11:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,246,1549958400"; d="scan'208";a="133047709" Received: from shwdeopenpsi508.ccr.corp.intel.com ([10.239.158.50]) by fmsmga008.fm.intel.com with ESMTP; 19 Mar 2019 20:11:50 -0700 From: Zailiang Sun To: edk2-devel@lists.01.org Cc: David Wei , Yi Qian Date: Wed, 20 Mar 2019 11:11:46 +0800 Message-Id: <20190320031146.212-1-zailiang.sun@intel.com> X-Mailer: git-send-email 2.19.1.windows.1 MIME-Version: 1.0 Subject: [Patch V2][edk2-platforms/devel-MinnowBoardMax-UDK2017] Vlv2TbltDevicePkg: Enable USB3.0 source debug X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Mar 2019 03:11:52 -0000 Content-Transfer-Encoding: 8bit In V2: Track the bug in Bugzilla instead of HSD https://bugzilla.tianocore.org/show_bug.cgi?id=1634 Added a boolean macro SOURCE_DEBUG_USE_USB3 to dsc file in order to build a BIOS image with USB3.0 source level debugging libraries. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zailiang Sun Cc: David Wei Cc: Yi Qian --- Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 1 + Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------ Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- 4 files changed, 161 insertions(+), 52 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc index a73f881b79..632c8885f0 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -93,5 +93,6 @@ DEFINE ESRT_ENABLE = TRUE # DEFINE SOURCE_DEBUG_ENABLE = FALSE +DEFINE SOURCE_DEBUG_USE_USB3 = FALSE DEFINE HTTP_BOOT_SUPPORT = FALSE DEFINE NETWORK_TLS_ENABLE = FALSE \ No newline at end of file diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 1daf7137ee..2ed72437e4 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -261,9 +261,13 @@ !if $(SOURCE_DEBUG_ENABLE) == TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!else DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf @@ -359,8 +363,12 @@ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!else DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf @@ -409,6 +417,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -422,6 +433,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -436,10 +450,13 @@ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif @@ -459,10 +476,13 @@ PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif @@ -477,6 +497,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -488,6 +511,9 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -495,6 +521,9 @@ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -1026,6 +1055,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!endif } !endif @@ -1047,9 +1079,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 -!if $(TARGET) != RELEASE + !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf -!endif + !endif PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } $(PLATFORM_PACKAGE)/FvInfoPei/FvInfoPei.inf @@ -1085,7 +1117,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf !endif } - MdeModulePkg/Universal/Variable/Pei/VariablePei.inf MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf @@ -1277,8 +1308,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf } - - MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf @@ -1339,9 +1368,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !endif - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf @@ -1403,13 +1432,20 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf{ !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !endif - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf + $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf { + + !if $(TARGET) != RELEASE + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + !else + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + !endif + } $(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 0d34a1c50b..f19d721dac 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -105,7 +105,7 @@ UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf -!if $(HTTP_BOOT_SUPPORT) == TRUE +!if $(HTTP_BOOT_SUPPORT) == TRUE TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf @@ -113,7 +113,7 @@ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif - + # # Basic # @@ -261,9 +261,13 @@ !if $(SOURCE_DEBUG_ENABLE) == TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!else DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf @@ -359,8 +363,12 @@ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!else DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf @@ -374,8 +382,6 @@ Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCPei/Tpm2DeviceLibSeC.inf !endif - - [LibraryClasses.X64] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf @@ -386,6 +392,7 @@ !if $(SECURE_BOOT_ENABLE) == TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif + [LibraryClasses.IA32] # # DXE phase common @@ -421,6 +428,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -434,6 +444,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -448,10 +461,13 @@ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif @@ -471,10 +487,13 @@ PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif @@ -489,16 +508,23 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif !if $(CAPSULE_ENABLE) == TRUE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf !endif + [LibraryClasses.common.UEFI_DRIVER] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -506,6 +532,9 @@ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -894,11 +923,9 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001 ## This PCD defines the video horizontal resolution. # This PCD could be set to 0 then video resolution could be at highest resolution. - #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0 gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800 ## This PCD defines the video vertical resolution. # This PCD could be set to 0 then video resolution could be at highest resolution. - #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0 gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600 ## This PCD defines the Console output column and the default value is 25 according to UEFI spec. @@ -1034,6 +1061,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!endif } !endif @@ -1055,9 +1085,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 -!if $(TARGET) != RELEASE + !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf -!endif + !endif PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } $(PLATFORM_PACKAGE)/FvInfoPei/FvInfoPei.inf @@ -1260,7 +1290,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf @@ -1293,9 +1323,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf !if $(TARGET) == DEBUG DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf - !endif - } + SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf + !endif + } $(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf @@ -1350,9 +1380,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ -!if $(TARGET) != RELEASE + !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf -!endif + !endif PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } @@ -1415,13 +1445,20 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf{ !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf + $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf { + + !if $(TARGET) != RELEASE + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + !else + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + !endif + } $(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf @@ -1646,7 +1683,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf # capsule related drivers # IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf - MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index e805871ec3..18f4d2bc67 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -76,7 +76,7 @@ !endif DEFINE PLATFORM_PCIEXPRESS_BASE = 0E0000000 - + DEFINE SEC_ENABLE = FALSE DEFINE SEC_DEBUG_INFO_ENABLE = FALSE DEFINE FTPM_ENABLE = FALSE @@ -105,7 +105,7 @@ UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf -!if $(HTTP_BOOT_SUPPORT) == TRUE +!if $(HTTP_BOOT_SUPPORT) == TRUE TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf @@ -113,7 +113,7 @@ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif - + # # Basic # @@ -261,9 +261,13 @@ !if $(SOURCE_DEBUG_ENABLE) == TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!else DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf @@ -359,8 +363,12 @@ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!else DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf @@ -420,6 +428,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -433,6 +444,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -447,10 +461,13 @@ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif @@ -470,10 +487,13 @@ PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif @@ -488,6 +508,9 @@ !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -499,6 +522,9 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -506,6 +532,9 @@ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf !if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf +!endif DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif @@ -1032,6 +1061,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!if $(SOURCE_DEBUG_USE_USB3) == TRUE + DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf +!endif } !endif @@ -1053,9 +1085,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6 -!if $(TARGET) != RELEASE + !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf -!endif + !endif PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } $(PLATFORM_PACKAGE)/FvInfoPei/FvInfoPei.inf @@ -1091,7 +1123,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf !endif } - MdeModulePkg/Universal/Variable/Pei/VariablePei.inf MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf @@ -1178,7 +1209,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif } - + !if $(DXE_ARCHITECTURE) == X64 !if $(CAPSULE_ENABLE) == TRUE MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf { @@ -1292,9 +1323,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf !if $(TARGET) == DEBUG DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf - !endif - } + SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf + !endif + } $(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf @@ -1321,7 +1352,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 } - + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf @@ -1349,9 +1380,9 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ -!if $(TARGET) != RELEASE + !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf -!endif + !endif PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } @@ -1414,15 +1445,21 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf $(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf{ !if $(TARGET) != RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf - $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf + $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf { + + !if $(TARGET) != RELEASE + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf + !else + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + !endif + } $(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf - $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf @@ -1646,7 +1683,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf # capsule related drivers # IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf - MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf -- 2.19.1.windows.1