diff options
author | zwei4 <david.wei@intel.com> | 2017-05-26 11:13:42 +0800 |
---|---|---|
committer | zwei4 <david.wei@intel.com> | 2017-05-26 11:13:42 +0800 |
commit | 673afaa1174832eeab98ccfd89e7d1504aecc1f5 (patch) | |
tree | 2bdb88319c033b7427600d5336fa11fc9504dd9e /Platform/BroxtonPlatformPkg/Common | |
parent | 22c9d0932dca0d0d959faf8399c8f220ba5ff7d2 (diff) | |
download | edk2-platforms-673afaa1174832eeab98ccfd89e7d1504aecc1f5.tar.xz |
GCC build support.
Change code which is not compatible with GCC.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
Diffstat (limited to 'Platform/BroxtonPlatformPkg/Common')
8 files changed, 34 insertions, 1 deletions
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c b/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c index ef45fdb6bf..40655c2f65 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 68d68d3272..41c59f1930 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 03467674ba..8b0036751f 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 91334f9e71..7d84e26b76 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 c931b07ff3..5bde26321d 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 c931b07ff3..5bde26321d 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 b0c96267d0..024384fe85 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 0689f31647..44c1cc4b82 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.<BR>
+ Copyright (c) 1999 - 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
@@ -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,
|