Enable source level debug.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>

15 files changed, 76 insertions, 16 deletions

diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat
index 2ecc28d6bc..7aca176505 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBios.bat
@@ -204,7 +204,7 @@ copy /y nul %Build_Macros% >nul
 

 ::output platform specific build macros to DefineAtBuildMacros.dsc

 echo DEFINE ENBDT_PF_BUILD          = %ENBDT_PF_BUILD%          >> %Build_Macros%

-echo DEFINE SOURCE_DEBUG_ENABLE     = %SrcDebug%                >> %Build_Macros%

+

 echo DEFINE APLK_SETUP_ENABLE_BUILD = %APLK_SETUP_ENABLE_BUILD% >> %Build_Macros%

 

 if "%Arch%"=="IA32" (

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc
index bfc45ff2ff..1341e082bf 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc
@@ -201,3 +201,6 @@
   $(PLATFORM_PACKAGE_COMMON)/FpdtPei/FpdtPei.inf

 !endif

 

+!if $(SOURCE_DEBUG_ENABLE) == TRUE

+  SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf

+!endif
\ No newline at end of file
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
index 234c27708d..04f616c367 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
@@ -32,6 +32,10 @@
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   }

 

+!if $(SOURCE_DEBUG_ENABLE) == TRUE

+  SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.inf

+!endif

+

   UefiCpuPkg/CpuDxe/CpuDxe.inf {

     <LibraryClasses>

       CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Defines.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Defines.dsc
index 842acf3085..69641ced3c 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/Defines.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Defines.dsc
@@ -163,3 +163,8 @@
     DEFINE FSP_RAM_CODE_SIZE               = $(FSP_IBBM_SIZE)

     DEFINE CAR_REGION_SIZE                 = 0x100000

 

+!if $(TARGET) == DEBUG

+  DEFINE SOURCE_DEBUG_ENABLE     = TRUE

+!else 

+  DEFINE SOURCE_DEBUG_ENABLE     = FALSE

+!endif
\ No newline at end of file
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeCore.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeCore.dsc
index 5ae62d3dca..d60c900e78 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeCore.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeCore.dsc
@@ -30,4 +30,10 @@
         TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf

      !endif

   !endif

+ 

+!if $(SOURCE_DEBUG_ENABLE) == TRUE

+  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf

+!else

+  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+!endif

 

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeRuntimeDriver.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeRuntimeDriver.dsc
index 75c07b1513..9e13b6ff2e 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeRuntimeDriver.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeRuntimeDriver.dsc
@@ -19,3 +19,9 @@
      BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

   !endif

 

+  !if $(SOURCE_DEBUG_ENABLE) == TRUE

+    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf

+  !else

+    DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+  !endif

+

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc
index 5a2feaaa38..643cbd0a5c 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc
@@ -23,6 +23,8 @@
 

   !if $(SOURCE_DEBUG_ENABLE) == TRUE

      DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf

+  !else 

+     DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

   !endif

 

   !if $(SECURE_BOOT_ENABLE) == TRUE

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.IA32.PEI.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.IA32.PEI.dsc
index 2b004019d0..d4617aa42e 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.IA32.PEI.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.IA32.PEI.dsc
@@ -43,7 +43,11 @@
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf

   SerialPortLib|$(PLATFORM_PACKAGE_COMMON)/Library/BaseSerialPortLib/BaseSerialPortLib.inf

 !if $(SOURCE_DEBUG_ENABLE) == TRUE

-   SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf

+  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf 

+

+!else

+  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+

 !endif

 

   DebugLib|$(PLATFORM_PACKAGE_COMMON)/Library/PeiDebugLib/PeiDebugLib.inf

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.SmmCore.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.SmmCore.dsc
index f04345efdc..e9edfff3df 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.SmmCore.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.SmmCore.dsc
@@ -27,3 +27,8 @@
      PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

   !endif

 

+  !if $(SOURCE_DEBUG_ENABLE) == TRUE

+    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf

+  !else

+    DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+  !endif

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc
index b3fb10a81f..a1023764e6 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc
@@ -22,7 +22,7 @@
    UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

    UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

    DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf

-   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

+

    !if $(SOURCE_DEBUG_ENABLE) == TRUE

       PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf

       DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf

@@ -30,6 +30,7 @@
    !else

       PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

    !endif

+   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

 

    #

    # Common

@@ -187,8 +188,6 @@
      SerialPortLib|$(PLATFORM_PACKAGE_COMMON)/Library/BaseSerialPortLib/BaseSerialPortLibNoInit.inf

    !endif

 

-   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

-

    PchSerialIoUartLib|$(PLATFORM_SI_PACKAGE)/SouthCluster/Library/PeiDxeSmmPchSerialIoUartLib/PeiDxeSmmPchSerialIoUartLib.inf

    PchSerialIoLib|$(PLATFORM_SI_PACKAGE)/SouthCluster/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf

    SerialPortParameterLib|$(PLATFORM_PACKAGE_COMMON)/Library/BaseSerialPortParameterLibCmos/BaseSerialPortParameterLibCmos.inf

@@ -208,12 +207,10 @@
    !endif

      TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf

 

-   !if ($(FTPM_ENABLE) == TRUE)

-     Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

-     Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf

-     PttPtpLib|$(PLATFORM_SI_PACKAGE)/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.inf

-     Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

-   !endif

+   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

+   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf

+   PttPtpLib|$(PLATFORM_SI_PACKAGE)/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.inf

+   Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

    TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

    OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

@@ -230,10 +227,6 @@
    ScDxeRuntimePciLibPciExpress|$(PLATFORM_SI_PACKAGE)/SouthCluster/Library/DxeRuntimePciLibPciExpress/DxeRuntimePciLibPciExpress.inf

    TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf

 

-   !if $(SOURCE_DEBUG_ENABLE) == TRUE

-     SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf

-   !endif

-

    LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf

    EfiRegTableLib|$(PLATFORM_PACKAGE_COMMON)/Library/EfiRegTableLib/EfiRegTableLib.inf

 

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc
index de883285d1..793e285ae9 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc
@@ -1,7 +1,7 @@
 ## @file

 #  Platform Fixed At Build Pcd Description.

 #

-#  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -80,3 +80,9 @@
   gClientCommonModuleTokenSpaceGuid.PcdStatusCodeFlagsCmosIndex|0x5C

   gEfiBxtTokenSpaceGuid.PcdPmcGcrBaseAddress|0xFE043000

 

+  !if $(SOURCE_DEBUG_ENABLE) == TRUE

+    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17

+    gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07

+    gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE

+  !endif

+

diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
index eeb0985d91..d267d0eef8 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
+++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
@@ -235,6 +235,10 @@
   READ_LOCK_STATUS   = TRUE

   FvNameGuid         = B73FE497-B92E-416e-8326-45AD0D270092

 

+!if $(SOURCE_DEBUG_ENABLE) == TRUE

+  INF  SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf

+!endif

+

   INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf

 

   INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf

@@ -387,6 +391,10 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf

 !endif

 

+!if $(SOURCE_DEBUG_ENABLE) == TRUE

+#  INF  SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.inf

+!endif

+

   INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf

   INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

   INF $(PLATFORM_PACKAGE_COMMON)/Console/PlatformStatusCodeHandler/RuntimeDxe/PlatformStatusCodeHandlerRuntimeDxe.inf

diff --git a/Platform/BroxtonPlatformPkg/PlatformPkgIA32.dsc b/Platform/BroxtonPlatformPkg/PlatformPkgIA32.dsc
index 6109a76c74..3513e1bd57 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkgIA32.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformPkgIA32.dsc
@@ -119,6 +119,12 @@
     PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

     TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf

   !endif

+  

+  !if $(SOURCE_DEBUG_ENABLE) == TRUE

+    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf

+  !else

+    DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+  !endif

 

 [LibraryClasses.Common.DXE_CORE]

   !include $(PLATFORM_NAME)/PlatformDsc/LibraryClasses.DxeCore.dsc

diff --git a/Platform/BroxtonPlatformPkg/PlatformPkgX64.dsc b/Platform/BroxtonPlatformPkg/PlatformPkgX64.dsc
index cdd91b3549..103bce9a41 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkgX64.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformPkgX64.dsc
@@ -119,6 +119,12 @@
     PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

     TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf

   !endif

+  

+  !if $(SOURCE_DEBUG_ENABLE) == TRUE

+    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf

+  !else

+    DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+  !endif

 

 [LibraryClasses.Common.DXE_CORE]

   !include $(PLATFORM_NAME)/PlatformDsc/LibraryClasses.DxeCore.dsc

diff --git a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
index 42f068a38e..bab962bbf9 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
@@ -119,6 +119,12 @@
     PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
     TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
   !endif
+  
+  !if $(SOURCE_DEBUG_ENABLE) == TRUE
+    DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
+  !else
+    DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+  !endif
 
 [LibraryClasses.Common.DXE_CORE]
   !include PlatformDsc/LibraryClasses.DxeCore.dsc