From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 AF97D21952CE5 for ; Thu, 25 May 2017 20:17:54 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 May 2017 20:17:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,394,1491289200"; d="scan'208";a="107171003" Received: from zwei4-mobl.ccr.corp.intel.com ([10.239.197.194]) by fmsmga006.fm.intel.com with ESMTP; 25 May 2017 20:17:53 -0700 From: zwei4 To: edk2-devel@lists.01.org Date: Fri, 26 May 2017 11:17:49 +0800 Message-Id: <20170526031749.10348-1-david.wei@intel.com> X-Mailer: git-send-email 2.11.0.windows.1 Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] GCC build support. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2017 03:17:55 -0000 Change code which is not compatible with GCC. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: zwei4 --- BuildBIOS.sh | 5 ++++ Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf | 3 ++- Platform/BroxtonPlatformPkg/BiosId.env | 1 + Platform/BroxtonPlatformPkg/BuildBios.sh | 4 ++-- Platform/BroxtonPlatformPkg/BuildIFWI.sh | 3 ++- .../SmramSaveInfoHandlerSmm.c | 1 + .../Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c | 1 + .../Common/Library/PlatformSecLib/Ia32/SecEntry.S | 1 + .../PlatformPostMemPei/PlatformInit.c | 3 +++ .../PlatformPostMemPei/PlatformInit.h | 1 + .../PlatformPreMemPei/PlatformInit.h | 1 + .../Common/PlatformSmm/Platform.c | 12 ++++++++++ .../Common/PlatformSmm/SmmPlatform.h | 15 +++++++++++- .../BroxtonPlatformPkg/DefineAtBuildMacros.dsc | 15 ++++++++---- .../BroxtonPlatformPkg/PlatformDsc/Components.dsc | 12 ++++++++++ Platform/BroxtonPlatformPkg/PlatformPkg.fdf | 28 ++++++++++++---------- .../SouthCluster/ScInit/Smm/ScInitSmm.h | 3 +++ .../SouthCluster/ScInit/Smm/ScPcieSmm.c | 1 + .../SouthCluster/ScSmiDispatcher/Smm/ScSmm.h | 3 +++ .../SouthCluster/ScSmiDispatcher/Smm/ScSmmCore.c | 2 ++ .../ScSmiDispatcher/Smm/ScSmmPeriodicTimer.c | 1 + .../BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmm.c | 10 ++++++++ .../BroxtonSiPkg/Txe/Heci/Smm/HeciSmmRuntimeDxe.c | 9 +++++++ 23 files changed, 113 insertions(+), 22 deletions(-) diff --git a/BuildBIOS.sh b/BuildBIOS.sh index 0dece1f77..ff815e9fa 100755 --- a/BuildBIOS.sh +++ b/BuildBIOS.sh @@ -11,6 +11,11 @@ Target_Flag=Release if [ "$1" == "Debug" ]; then Target_Flag=Debug + shift +fi +if [ "$1" == "Release" ]; then + Target_Flag=Release + shift fi echo $Target_Flag diff --git a/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf index 9751ba1f0..4dfd82951 100644 --- a/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf +++ b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf @@ -1,7 +1,7 @@ ## @file # MP Initialize Library instance for DXE driver. # -# Copyright (c) 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -56,6 +56,7 @@ UefiCpuLib UefiBootServicesTableLib DebugAgentLib + SynchronizationLib [Protocols] gEfiTimerArchProtocolGuid ## SOMETIMES_CONSUMES diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 2bf5bada9..18b4e0190 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -33,3 +33,4 @@ OEM_ID = X64 BUILD_TYPE = D VERSION_MAJOR = 0064 VERSION_MINOR = 01 +BOARD_EXT = X64 diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/BuildBios.sh index cadffc70d..fb6ac670d 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBios.sh @@ -317,7 +317,7 @@ cat SpiChunk1.bin IBBL.Fv IBB.Fv SpiChunk2.bin OBB.Fv NvStorage.Fv SpiChunk3.bin popd echo -echo SPI IFWI location: $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name"_GCC".bin +echo Check if SPI IFWI image is generated at below location: +echo $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name"_GCC".bin echo -echo -------------------- The EDKII BIOS build has successfully completed. -------------------- echo diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh b/Platform/BroxtonPlatformPkg/BuildIFWI.sh index bf91b5c18..a319bd3ee 100755 --- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh +++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh @@ -163,6 +163,7 @@ echo "Build_IFWI: Calling BIOS build Script..." sh Platform/BroxtonPlatformPkg/BuildBios.sh $Build_Flags $Platform_Type $Build_Target echo -echo Finished Building BIOS. +echo Finished Building Process. +echo diff --git a/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c b/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c index ef45fdb6b..40655c2f6 100644 --- a/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c +++ b/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c @@ -45,6 +45,7 @@ CPU_INFO_PROTOCOL *mCpuInfoProtocol; **/ EFI_STATUS +EFIAPI SmramSaveInfoHandler ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_SW_REGISTER_CONTEXT *DispatchContext diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c index 68d68d327..41c59f193 100644 --- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c +++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c @@ -756,6 +756,7 @@ UpdatePlatformInformation ( **/ VOID +EFIAPI AddSmbiosT0x94Callback ( IN EFI_EVENT Event, IN VOID *Context diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S index 03467674b..8b0036751 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S +++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S @@ -207,6 +207,7 @@ ASM_PFX (PlatformInitialization): # movl $0x121, %ecx movl $(BIT16 + ACPI_BASE_ADDRESS + R_ACPI_PM1_TMR), %eax # Bit 16 is enable and 15:0 address + movl $0x2FBA2E25, %edx wrmsr # diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c index 91334f9e7..7d84e26b7 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c @@ -31,6 +31,7 @@ #endif EFI_STATUS +EFIAPI CpuS3SmmAccessNotifyCallback ( IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, @@ -545,6 +546,7 @@ PeiGetSectionFromFv ( EFI_STATUS +EFIAPI CpuS3SmmAccessNotifyCallback ( IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, @@ -571,6 +573,7 @@ CpuS3SmmAccessNotifyCallback ( **/ EFI_STATUS +EFIAPI EndOfPeiPpiNotifyCallback ( IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h index c931b07ff..5bde26321 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h @@ -153,6 +153,7 @@ GetSleepTypeAfterWakeup ( ); EFI_STATUS +EFIAPI EndOfPeiPpiNotifyCallback ( IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h index c931b07ff..5bde26321 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h @@ -153,6 +153,7 @@ GetSleepTypeAfterWakeup ( ); EFI_STATUS +EFIAPI EndOfPeiPpiNotifyCallback ( IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c b/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c index b0c96267d..024384fe8 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c @@ -78,6 +78,7 @@ DevicePathSize ( ); EFI_STATUS +EFIAPI S5SleepWakeOnRtcCallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -441,6 +442,7 @@ Stall ( EFI_STATUS +EFIAPI SmmReadyToBootCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -484,6 +486,7 @@ SmmReadyToBootCallback ( **/ EFI_STATUS +EFIAPI SxSleepEntryCallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -623,6 +626,7 @@ SetAfterG3On ( **/ EFI_STATUS +EFIAPI PowerButtonCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -681,6 +685,7 @@ PowerButtonCallback ( VOID +EFIAPI PmeCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_ICHN_DISPATCH_CONTEXT *DispatchContext @@ -691,6 +696,7 @@ PmeCallback ( EFI_STATUS +EFIAPI S5SleepAcLossCallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -711,6 +717,7 @@ S5SleepAcLossCallBack ( EFI_STATUS +EFIAPI S4S5CallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -754,6 +761,7 @@ S4S5CallBack ( **/ EFI_STATUS +EFIAPI EnableAcpiCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -822,6 +830,7 @@ EnableAcpiCallback ( **/ EFI_STATUS +EFIAPI DisableAcpiCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -843,6 +852,7 @@ DisableAcpiCallback ( VOID +EFIAPI DummyTco1Callback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_ICHN_DISPATCH_CONTEXT *DispatchContext @@ -877,6 +887,7 @@ DevicePathSize ( EFI_STATUS +EFIAPI S5SleepWakeOnRtcCallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -1064,6 +1075,7 @@ BcdToHex( **/ EFI_STATUS +EFIAPI TpmPtsSmbsCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSmm/SmmPlatform.h b/Platform/BroxtonPlatformPkg/Common/PlatformSmm/SmmPlatform.h index 0689f3164..44c1cc4b8 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSmm/SmmPlatform.h +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSmm/SmmPlatform.h @@ -1,7 +1,7 @@ /** @file Header file for Platform Smm driver. - Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -108,6 +108,7 @@ typedef struct { // Callback function prototypes // EFI_STATUS +EFIAPI PowerButtonCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -116,6 +117,7 @@ PowerButtonCallback ( ); EFI_STATUS +EFIAPI S5SleepWakeOnLanCallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -124,6 +126,7 @@ S5SleepWakeOnLanCallBack ( ); EFI_STATUS +EFIAPI S5SleepAcLossCallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -133,6 +136,7 @@ S5SleepAcLossCallBack ( EFI_STATUS +EFIAPI S4S5CallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -141,6 +145,7 @@ S4S5CallBack ( ); EFI_STATUS +EFIAPI EnableAcpiCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -149,6 +154,7 @@ EnableAcpiCallback ( ); EFI_STATUS +EFIAPI DisableAcpiCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -157,6 +163,7 @@ DisableAcpiCallback ( ); EFI_STATUS +EFIAPI SmmReadyToBootCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -165,18 +172,21 @@ SmmReadyToBootCallback ( ); VOID +EFIAPI DummyTco1Callback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_ICHN_DISPATCH_CONTEXT *DispatchContext ); VOID +EFIAPI PmeCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_ICHN_DISPATCH_CONTEXT *DispatchContext ); VOID +EFIAPI PerrSerrCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_ICHN_DISPATCH_CONTEXT *DispatchContext @@ -184,6 +194,7 @@ PerrSerrCallback ( VOID +EFIAPI EnableWatchdogCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_ICHN_DISPATCH_CONTEXT *DispatchContext @@ -199,6 +210,7 @@ TurnOffVregUsb ( ); EFI_STATUS +EFIAPI SxSleepEntryCallBack ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, @@ -212,6 +224,7 @@ SaveRuntimeScriptTable ( ); EFI_STATUS +EFIAPI TpmPtsSmbsCallback ( IN EFI_HANDLE DispatchHandle, IN CONST VOID *DispatchContext, diff --git a/Platform/BroxtonPlatformPkg/DefineAtBuildMacros.dsc b/Platform/BroxtonPlatformPkg/DefineAtBuildMacros.dsc index d9290217c..e5ee4c1b4 100644 --- a/Platform/BroxtonPlatformPkg/DefineAtBuildMacros.dsc +++ b/Platform/BroxtonPlatformPkg/DefineAtBuildMacros.dsc @@ -1,4 +1,11 @@ -DEFINE ENBDT_PF_BUILD = TRUE -DEFINE SOURCE_DEBUG_ENABLE = FALSE -DEFINE APLK_SETUP_ENABLE_BUILD = TRUE -DEFINE X64_CONFIG = TRUE +DEFINE ENBDT_PF_BUILD = TRUE +DEFINE TABLET_PF_BUILD = FALSE +DEFINE BYTI_PF_BUILD = FALSE +DEFINE CSLE_ENABLE = FALSE +DEFINE VP_BIOS_ENABLE = FALSE +DEFINE SV_BIOS_ENABLE = FALSE +DEFINE PPV_BIOS_ENABLE = FALSE +DEFINE RVVP_BIOS_ENABLE = FALSE +DEFINE RVV_BIOS_ENABLE = FALSE +DEFINE SOURCE_DEBUG_ENABLE = FALSE +DEFINE X64_CONFIG = TRUE diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc index a58086138..13225761c 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc @@ -31,6 +31,18 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } + + UefiCpuPkg/CpuDxe/CpuDxe.inf { + + CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf + MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf + LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf + UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf + SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf + MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf + } + UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf index 7522153a3..ac09ac329 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf @@ -170,14 +170,7 @@ !if $(SECURE_BOOT_ENABLE) FILE = $(WORKSPACE)/Platform/$(PLATFORM_PACKAGE_COMMON)/Binaries/Prebuild/X64/VpdBlockSecBoot.bin !else - !if $(TOOL_CHAIN_TAG) != GCC47 FILE = $(WORKSPACE)/Platform/$(PLATFORM_PACKAGE_COMMON)/Binaries/Prebuild/X64/VpdBlock.bin - !else - # - # Temporary solution for not having FCE linux version - # - FILE = $(WORKSPACE)/Platform/$(PLATFORM_PACKAGE_COMMON)/Binaries/Prebuild/X64/VpdBlockVar.bin - !endif !endif $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET)|$(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE) @@ -501,16 +494,23 @@ APRIORI DXE { INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf !endif +!if $(TOOL_CHAIN_TAG) == GCC5 + INF UefiCpuPkg/CpuDxe/CpuDxe.inf +!else INF $(PLATFORM_SI_PACKAGE)/Cpu/CpuInit/Dxe/CpuInitDxe.inf +!endif + INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf - INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyDxe/FspNotifyDxe.inf +!if $(TOOL_CHAIN_TAG) != GCC5 + INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyDxe/FspNotifyDxe.inf +!endif - !if $(SMM_VARIABLE_ENABLE) - INF $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageSmmRuntimeDxe.inf - !else - INF $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageRuntimeDxe.inf - !endif +!if $(SMM_VARIABLE_ENABLE) + INF $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageSmmRuntimeDxe.inf +!else + INF $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageRuntimeDxe.inf +!endif !if $(SMM_VARIABLE_ENABLE) @@ -557,7 +557,9 @@ APRIORI DXE { INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformInfoDxe/PlatformInfoDxe.inf #INF $(TABLET_PLATFORM_PACKAGE)/PlatformCpuInfo/PlatformCpuInfoDxe.inf INF $(PLATFORM_PACKAGE_COMMON)/SaveMemoryConfigDxe/SaveMemoryConfigDxe.inf +!if $(TOOL_CHAIN_TAG) != GCC5 INF $(PLATFORM_PACKAGE_COMMON)/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf +!endif !if $(GOP_DRIVER_ENABLE) == TRUE INF $(PLATFORM_PACKAGE_COMMON)/Console/PlatformGopPolicyDxe/PlatformGopPolicyDxe.inf diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScInitSmm.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScInitSmm.h index b2e7fb447..0437c72ad 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScInitSmm.h +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScInitSmm.h @@ -186,6 +186,7 @@ ScPcieLinkEqHandlerFunction ( **/ VOID +EFIAPI ScPciePmSwSmiCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_SW_REGISTER_CONTEXT *DispatchContext, @@ -268,6 +269,7 @@ ScSxHandler ( **/ VOID +EFIAPI ScLanSxCallback ( VOID ); @@ -281,6 +283,7 @@ ScLanSxCallback ( **/ VOID +EFIAPI ScGpioSxIsolationCallBack ( VOID ); diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScPcieSmm.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScPcieSmm.c index afc455b0f..43b162567 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScPcieSmm.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Smm/ScPcieSmm.c @@ -183,6 +183,7 @@ ScPciePmIoTrapSmiCallback ( **/ VOID +EFIAPI ScPciePmSwSmiCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_SW_REGISTER_CONTEXT *DispatchContext, diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmm.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmm.h index ef6274a1e..4be814fc6 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmm.h +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmm.h @@ -499,6 +499,7 @@ typedef struct { **/ EFI_STATUS +EFIAPI ScSmmCoreRegister ( IN SC_SMM_GENERIC_PROTOCOL *This, IN EFI_SMM_HANDLER_ENTRY_POINT2 DispatchFunction, @@ -522,6 +523,7 @@ ScSmmCoreRegister ( **/ EFI_STATUS +EFIAPI ScSmmCoreUnRegister ( IN SC_SMM_GENERIC_PROTOCOL *This, IN EFI_HANDLE *DispatchHandle @@ -767,6 +769,7 @@ ScSmmPeriodicTimerClearSource ( **/ EFI_STATUS +EFIAPI ScSmmPeriodicTimerDispatchGetNextShorterInterval ( IN CONST EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL *This, IN OUT UINT64 **SmiTickInterval diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmCore.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmCore.c index 2886a849e..4eb25dbc6 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmCore.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmCore.c @@ -292,6 +292,7 @@ SmiInputValueDuplicateCheck ( **/ EFI_STATUS +EFIAPI ScSmmCoreRegister ( IN SC_SMM_GENERIC_PROTOCOL *This, IN EFI_SMM_HANDLER_ENTRY_POINT2 DispatchFunction, @@ -557,6 +558,7 @@ Error: **/ EFI_STATUS +EFIAPI ScSmmCoreUnRegister ( IN SC_SMM_GENERIC_PROTOCOL *This, IN EFI_HANDLE *DispatchHandle diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmPeriodicTimer.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmPeriodicTimer.c index c752e2e4e..61d13f53b 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmPeriodicTimer.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmmPeriodicTimer.c @@ -505,6 +505,7 @@ ScSmmPeriodicTimerProgramTimers ( **/ EFI_STATUS +EFIAPI ScSmmPeriodicTimerDispatchGetNextShorterInterval ( IN CONST EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL *This, IN OUT UINT64 **SmiTickInterval diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmm.c b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmm.c index c95cf0195..518636a6a 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmm.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmm.c @@ -106,6 +106,7 @@ IsHeciCseResponse ( ); EFI_STATUS +EFIAPI EfiHeciReadMessage ( IN HECI_DEVICE HeciDev, IN UINT32 Blocking, @@ -1002,6 +1003,7 @@ SmmEndOfDxeCallback ( **/ EFI_STATUS +EFIAPI EfiHeciSendwack ( IN HECI_DEVICE HeciDev, IN OUT UINT32 *Message, @@ -1040,6 +1042,7 @@ EfiHeciSendwack ( **/ EFI_STATUS +EFIAPI EfiHeciReadMessage ( IN HECI_DEVICE HeciDev, IN UINT32 Blocking, @@ -1070,6 +1073,7 @@ EfiHeciReadMessage ( **/ EFI_STATUS +EFIAPI EfiHeciSendMessage ( IN HECI_DEVICE HeciDev, IN UINT32 *Message, @@ -1095,6 +1099,7 @@ EfiHeciSendMessage ( **/ EFI_STATUS +EFIAPI EfiHeciReset ( IN HECI_DEVICE HeciDev ) @@ -1113,6 +1118,7 @@ EfiHeciReset ( **/ EFI_STATUS +EFIAPI EfiHeciInit ( IN HECI_DEVICE HeciDev ) @@ -1131,6 +1137,7 @@ EfiHeciInit ( **/ EFI_STATUS +EFIAPI EfiHeciReinit ( IN HECI_DEVICE HeciDev ) @@ -1150,6 +1157,7 @@ EfiHeciReinit ( **/ EFI_STATUS +EFIAPI EfiHeciResetWait ( IN HECI_DEVICE HeciDev, IN UINT32 Delay @@ -1169,6 +1177,7 @@ EfiHeciResetWait ( **/ EFI_STATUS +EFIAPI EfiHeciGetSecStatus ( IN UINT32 *Status ) @@ -1188,6 +1197,7 @@ EfiHeciGetSecStatus ( **/ EFI_STATUS +EFIAPI EfiHeciGetSecMode ( IN HECI_DEVICE HeciDev, IN UINT32 *Mode diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmmRuntimeDxe.c b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmmRuntimeDxe.c index 53184c414..050137617 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmmRuntimeDxe.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Heci/Smm/HeciSmmRuntimeDxe.c @@ -187,6 +187,7 @@ SendCommunicateBuffer ( **/ EFI_STATUS +EFIAPI EfiHeciSendwack ( IN HECI_DEVICE HeciDev, IN OUT UINT32 *Message, @@ -261,6 +262,7 @@ Done: **/ EFI_STATUS +EFIAPI EfiHeciReadMessage ( IN HECI_DEVICE HeciDev, IN UINT32 Blocking, @@ -322,6 +324,7 @@ Done: **/ EFI_STATUS +EFIAPI EfiHeciSendMessage ( IN HECI_DEVICE HeciDev, IN UINT32 *Message, @@ -381,6 +384,7 @@ Done: **/ EFI_STATUS +EFIAPI EfiHeciReset ( IN HECI_DEVICE HeciDev ) @@ -402,6 +406,7 @@ EfiHeciReset ( **/ EFI_STATUS +EFIAPI EfiHeciInit ( IN HECI_DEVICE HeciDev ) @@ -424,6 +429,7 @@ EfiHeciInit ( **/ EFI_STATUS +EFIAPI EfiHeciReinit ( IN HECI_DEVICE HeciDev ) @@ -447,6 +453,7 @@ EfiHeciReinit ( **/ EFI_STATUS +EFIAPI EfiHeciResetWait ( IN HECI_DEVICE HeciDev, IN UINT32 Delay @@ -470,6 +477,7 @@ EfiHeciResetWait ( **/ EFI_STATUS +EFIAPI EfiHeciGetSecStatus ( OUT UINT32 *Status2 ) @@ -510,6 +518,7 @@ Done: **/ EFI_STATUS +EFIAPI EfiHeciGetSecMode ( IN HECI_DEVICE HeciDev, OUT UINT32 *Mode -- 2.11.0.windows.1