diff options
| author | Guo Mang <mang.guo@intel.com> | 2016-04-15 16:37:29 +0800 |
|---|---|---|
| committer | zwei4 <david.wei@intel.com> | 2016-04-15 17:36:20 +0800 |
| commit | cd1fa3ef3e66618f5ee08f839ab04f49553c89f1 (patch) | |
| tree | 4accc3140ba7465ca54582ca34bb356e7359c849 | |
| parent | 875495a84ad6d9ad08816feaa35b39da1f35319c (diff) | |
| download | edk2-platforms-cd1fa3ef3e66618f5ee08f839ab04f49553c89f1.tar.xz | |
Vlv2TbltDevicePkg: Fixed build issue when src level debug is ON,
and updated Pismmcpudxesmm build path.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Mang Guo <mang.guo@intel.com>
Reviewed-by: Tim He <tim.he@intel.com>
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkg.fdf | 9 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 9 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 9 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 9 |
5 files changed, 34 insertions, 3 deletions
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index dbdbb9d562..e40dcd448d 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -545,7 +545,16 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET # INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf + +!if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE +INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +!else INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +!endif +!else +INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +!endif INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc index 0ad8b4a538..a387235761 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -91,8 +91,11 @@ DEFINE ESRT_ENABLE = TRUE # # Enable source level debug default # +!if $(TARGET) == RELEASE DEFINE SOURCE_DEBUG_ENABLE = FALSE - - - +DEFINE SMM_SOURCE_DEBUG_ENABLE = FALSE +!else +DEFINE SOURCE_DEBUG_ENABLE = TRUE +DEFINE SMM_SOURCE_DEBUG_ENABLE = FALSE +!endif diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 0df8647329..bee20a8f57 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -243,6 +243,7 @@ DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf + DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 1111e55bc7..f533a9a84e 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -243,6 +243,7 @@ DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf + DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf @@ -1337,7 +1338,15 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf + !if $(SOURCE_DEBUG_ENABLE) == TRUE + !if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf + !else $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf + !endif + !else + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf + !endif UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 2c9d5135dd..7c9d72cf9c 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -243,6 +243,7 @@ DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf + DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf !else PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf @@ -1346,7 +1347,15 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf +!if $(SOURCE_DEBUG_ENABLE) == TRUE +!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +!else + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +!endif +!else $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +!endif UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf |