From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: nathaniel.l.desimone@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Tue, 10 Sep 2019 19:32:35 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2019 19:32:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,491,1559545200"; d="scan'208";a="191994025" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by FMSMGA003.fm.intel.com with ESMTP; 10 Sep 2019 19:32:34 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.225]) by ORSMSX104.amr.corp.intel.com ([169.254.4.123]) with mapi id 14.03.0439.000; Tue, 10 Sep 2019 19:32:34 -0700 From: "Nate DeSimone" To: "Agyeman, Prince" , "devel@edk2.groups.io" CC: "Wei, David Y" , "Gao, Liming" , "Sinha, Ankit" , "Kubacki, Michael A" Subject: Re: [edk2-platforms] [PATCH 2/3] SimicsOpenBoardPkg: Fix GCC build issues Thread-Topic: [edk2-platforms] [PATCH 2/3] SimicsOpenBoardPkg: Fix GCC build issues Thread-Index: AQHVZ2RzeSKtQHtQckiF8BpAJavYjqclw2fQ Date: Wed, 11 Sep 2019 02:32:33 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AAEEAB17E@ORSMSX114.amr.corp.intel.com> References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjI0ZWI5ZjAtYTA4Mi00MzJmLTk2NjItNjA0OWI4NmM2MjFkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiWjA3R0dpZXk5b1liT0NCOUd2ampnMUtwZ1ZBaldvNDFUWkNXS0Y4WVVrTXBcLzBoNnZWRHQ0ZjJwWDdGK3JIM0wifQ== x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Agyeman, Prince=20 Sent: Monday, September 9, 2019 4:15 PM To: devel@edk2.groups.io Cc: Wei, David Y ; Gao, Liming ; Sinha, Ankit ; Agyeman, Prince ; Kubacki, Michael A ; Desimone, Natha= niel L Subject: [edk2-platforms] [PATCH 2/3] SimicsOpenBoardPkg: Fix GCC build iss= ues Cc: David Wei Cc: Liming Gao Cc: Ankit Sinha Cc: Agyeman Prince Cc: Kubacki Michael A Cc: Nate DeSimone Signed-off-by: Prince Agyeman --- .../PlatformBootManagerLib/BdsPlatform.c | 38 ------------------- .../SimicsOpenBoardPkg/SecCore/SecMain.c | 23 ----------- 2 files changed, 61 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerL= ib/BdsPlatform.c b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootMa= nagerLib/BdsPlatform.c index 117c72b35f..953a4a6c15 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsP= latform.c +++ b/Platform/Intel/SimicsOpenBoardPkg/Library/PlatformBootManagerLib/BdsP= latform.c @@ -316,12 +316,6 @@ ConnectRootBridge ( IN VOID *Context ); =20 -STATIC -VOID -SaveS3BootScript ( - VOID - ); - // // BDS Platform Functions // @@ -1296,38 +1290,6 @@ PlatformBdsConnectSequence ( PciAcpiInitialization (); } =20 -/** - Save the S3 boot script. - - Note that DxeSmmReadyToLock must be signaled after this function returns= ; - otherwise the script wouldn't be saved actually. -**/ -STATIC -VOID -SaveS3BootScript ( - VOID - ) -{ - EFI_STATUS Status; - EFI_S3_SAVE_STATE_PROTOCOL *BootScript; - STATIC CONST UINT8 Info[] =3D { 0xDE, 0xAD, 0xBE, 0xEF }; - - Status =3D gBS->LocateProtocol (&gEfiS3SaveStateProtocolGuid, NULL, - (VOID **) &BootScript); - ASSERT_EFI_ERROR (Status); - - // - // Despite the opcode documentation in the PI spec, the protocol - // implementation embeds a deep copy of the info in the boot script, rat= her - // than storing just a pointer to runtime or NVS storage. - // - Status =3D BootScript->Write(BootScript, EFI_BOOT_SCRIPT_INFORMATION_OPC= ODE, - (UINT32) sizeof Info, - (EFI_PHYSICAL_ADDRESS)(UINTN) &Info); - ASSERT_EFI_ERROR (Status); -} - - /** Do the platform specific action after the console is ready =20 diff --git a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c b/Platform= /Intel/SimicsOpenBoardPkg/SecCore/SecMain.c index 5cbb47687b..4514641b46 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c +++ b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c @@ -495,29 +495,6 @@ FindPeiCoreImageBaseInFv ( return EFI_SUCCESS; } =20 - -/** - Reads 8-bits of CMOS data. - - Reads the 8-bits of CMOS data at the location specified by Index. - The 8-bit read value is returned. - - @param Index The CMOS location to read. - - @return The value read. - -**/ -STATIC -UINT8 -CmosRead8 ( - IN UINTN Index - ) -{ - IoWrite8 (0x70, (UINT8) Index); - return IoRead8 (0x71); -} - - STATIC BOOLEAN IsS3Resume ( --=20 2.19.1.windows.1