From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 7389A21A16E3A for ; Wed, 10 May 2017 23:25:18 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 May 2017 23:25:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,322,1491289200"; d="scan'208";a="1167578934" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga002.fm.intel.com with ESMTP; 10 May 2017 23:25:17 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 10 May 2017 23:25:17 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.193]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.224]) with mapi id 14.03.0319.002; Thu, 11 May 2017 14:25:02 +0800 From: "Lu, ShifeiX A" To: "Wei, David" CC: "edk2-devel@lists.01.org" , "Lu, ShifeiX A" Thread-Topic: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fixed some GCC build errors. Thread-Index: AQHSygfzCI1dWx9BckORYrbmAvBS16HuqkXw Date: Thu, 11 May 2017 06:25:01 +0000 Message-ID: <757C127295B34C4F87D5D410F9197317682541D3@SHSMSX101.ccr.corp.intel.com> References: <20170511033729.27528-1-david.wei@intel.com> In-Reply-To: <20170511033729.27528-1-david.wei@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDNhY2IxZGUtY2IzOS00OWUwLWFlMGQtNjFhMjNhYjlkMDY5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IllFbGEzZFFONFFjbU1QNld5bmJIdDlNZXRwcWhvVDNudkQyb1FqbEJrR0E9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch][edk2-platforms/devel-MinnowBoard3] Fixed some GCC build errors. 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: Thu, 11 May 2017 06:25:18 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: lushifex Shifei -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of zwei= 4 Sent: Thursday, May 11, 2017 11:37 AM To: edk2-devel@lists.01.org Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fixed some GCC b= uild errors. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: zwei4 --- .../Board/LeafHill/BoardInitPostMem/BoardGpios.c | 35 +++++++++++-------= ---- .../Board/LeafHill/BoardInitPostMem/BoardInit.c | 6 ++-- .../Board/LeafHill/BoardInitPostMem/BoardInit.h | 4 +-- .../Board/LeafHill/BoardInitPreMem/BoardInit.h | 4 +-- .../LeafHill/BoardInitPreMem/BoardInitPreMem.inf | 2 +- .../MinnowBoard3/BoardInitPostMem/BoardGpios.c | 33 ++++++++++--------= -- .../MinnowBoard3/BoardInitPostMem/BoardInit.c | 6 ++-- .../MinnowBoard3/BoardInitPostMem/BoardInit.h | 4 +-- .../Board/MinnowBoard3/BoardInitPreMem/BoardInit.h | 4 +-- .../MinnowBoa= rd3/BoardInitPreMem/BoardInitMiscs.c | 3 +- .../BoardInitPreMem/BoardInitPreMem.inf | 2 +- 11 files changed, 50 insertions(+), 53 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Bo= ardGpios.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Bo= ardGpios.c index 96d325c45..971c192cd 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpio= s.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardG +++ pios.c @@ -1,7 +1,7 @@ /** @file Gpio setting for multiplatform. =20 - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -151,29 +151,28 @@ MultiPlatformGpioProgram ( ) { UINTN VariableSize; - EFI_STATUS Status; EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariableServices; SYSTEM_CONFIGURATION SystemConfiguration; =20 VariableSize =3D sizeof (SYSTEM_CONFIGURATION); ZeroMem (&SystemConfiguration, sizeof (SYSTEM_CONFIGURATION)); =20 - Status =3D (*PeiServices)->LocatePpi ( - PeiServices, - &gEfiPeiReadOnlyVariable2PpiGuid, - 0, - NULL, - (VOID **) &VariableServices - ); - - Status =3D VariableServices->GetVariable ( - VariableServices, - PLATFORM_SETUP_VARIABLE_NAME, - &gEfiSetupVariableGuid, - NULL, - &VariableSize, - &SystemConfiguration - ); + (*PeiServices)->LocatePpi ( + PeiServices, + &gEfiPeiReadOnlyVariable2PpiGuid, + 0, + NULL, + (VOID **) &VariableServices + ); + + VariableServices->GetVariable ( + VariableServices, + PLATFORM_SETUP_VARIABLE_NAME, + &gEfiSetupVariableGuid, + NULL, + &VariableSize, + &SystemConfiguration + ); =20 DEBUG ((DEBUG_INFO, "MultiPlatformGpioProgram()...\n")); =20 diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Bo= ardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Boa= rdInit.c index 9cd5e259b..9ae19e387 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit= .c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardI +++ nit.c @@ -1,7 +1,7 @@ /** @file Board Init driver. =20 - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -26,7 +26,7 @@ EFI_STATUS EFIAPI LeafHillPostMemInitCallbac= k ( - IN CONST EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, IN VOID *Ppi ); @@ -47,7 +47,7 @@ static EFI_PEI_PPI_DESCRIPTOR mLeafHillPostMemDonePpi =3D= { EFI_STATUS EFIAPI LeafHillPostMemInitCallback ( - IN CONST EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, IN VOID *Ppi ) diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Bo= ardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Boa= rdInit.h index 373b20312..fa3919e3c 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit= .h +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardI +++ nit.h @@ -2,7 +2,7 @@ GPIO setting for CherryView. This file includes package header files, library classes. =20 - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -20,7 +20,7 @@ #include #include = #include -#include +#include #include =20 VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/Boa= rdInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/Board= Init.h index 373b20312..fa3919e3c 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.= h +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardIn +++ it.h @@ -2,7 +2,7 @@ GPIO setting for CherryView. This file includes package header files, library classes. =20 - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -20,7 +20,7 @@ #include #include = #include -#include +#include #include =20 VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/Boa= rdInitPreMem.inf b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreM= em/BoardInitPreMem.inf index c526bc2c0..12a3441d4 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitP= reMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardIn +++ itPreMem.inf @@ -39,7 +39,7 @@ IntelFsp2Pkg/IntelFsp2Pkg.dec BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/IntelFsp2Wrappe= rPkg.dec IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec - Silicon\BroxtonSoC\BroxtonSiPkg\NorthCluster\MemoryInit\MemoryInit.dec + =20 + Silicon/BroxtonSoC/BroxtonSiPkg/NorthCluster/MemoryInit/MemoryInit.dec =20 [Pcd] gPlatformModuleTokenSpaceGuid.PcdBoardId diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMe= m/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPo= stMem/BoardGpios.c index 7e7c327cb..67103a4b0 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Board= Gpios.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Bo +++ ardGpios.c @@ -151,29 +151,28 @@ MultiPlatformGpioProgram ( ) { UINTN VariableSize; - EFI_STATUS Status; EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariableServices; SYSTEM_CONFIGURATION SystemConfiguration; =20 VariableSize =3D sizeof (SYSTEM_CONFIGURATION); ZeroMem (&SystemConfiguration, sizeof (SYSTEM_CONFIGURATION)); =20 - Status =3D (*PeiServices)->LocatePpi ( - PeiServices, - &gEfiPeiReadOnlyVariable2PpiGuid, - 0, - NULL, - (VOID **) &VariableServices - ); - - Status =3D VariableServices->GetVariable ( - VariableServices, - PLATFORM_SETUP_VARIABLE_NAME, - &gEfiSetupVariableGuid, - NULL, - &VariableSize, - &SystemConfiguration - ); + (*PeiServices)->LocatePpi ( + PeiServices, + &gEfiPeiReadOnlyVariable2PpiGuid, + 0, + NULL, + (VOID **) &VariableServices + ); + + VariableServices->GetVariable ( + VariableServices, + PLATFORM_SETUP_VARIABLE_NAME, + &gEfiSetupVariableGuid, + NULL, + &VariableSize, + &SystemConfiguration + ); =20 DEBUG ((DEBUG_INFO, "MultiPlatformGpioProgram()...\n")); =20 diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMe= m/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPos= tMem/BoardInit.c index 0291d150f..114c3c9ac 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Board= Init.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Bo +++ ardInit.c @@ -1,7 +1,7 @@ /** @file Board Init driver. =20 - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -26,7 +26,7 @@ EFI_STATUS EFIAPI MinnowBoard3PostMemInitCal= lback ( - IN CONST EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, IN VOID *Ppi ); @@ -47,7 +47,7 @@ static EFI_PEI_PPI_DESCRIPTOR mMinnowBoard3PostMemDonePpi= =3D { EFI_STATUS EFIAPI MinnowBoard3PostMemInitCallback ( - IN CONST EFI_PEI_SERVICES **PeiServices, + IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, IN VOID *Ppi ) diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMe= m/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPos= tMem/BoardInit.h index 373b20312..fa3919e3c 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Board= Init.h +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Bo +++ ardInit.h @@ -2,7 +2,7 @@ GPIO setting for CherryView. This file includes package header files, library classes. =20 - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -20,7 +20,7 @@ #include #include = #include -#include +#include #include =20 VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem= /BoardInit.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreM= em/BoardInit.h index 373b20312..fa3919e3c 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardI= nit.h +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/Boa +++ rdInit.h @@ -2,7 +2,7 @@ GPIO setting for CherryView. This file includes package header files, library classes. =20 - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -20,7 +20,7 @@ #include #include = #include -#include +#include #include =20 VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem= /BoardInitMiscs.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardIni= tPreMem/BoardInitMiscs.c index 997046ac0..7e0b52560 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardI= nitMiscs.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/Boa +++ rdInitMiscs.c @@ -140,7 +140,6 @@ Mb3DramCreatePolicyDefaults ( UINT8 (*ChSwizlePtr)[DRAM_POLICY_NUMBER_CH= ANNELS][DRAM_POLICY_NUMBER_BITS]; PlatfromDramConf *DramConfig; BOOLEAN ReadSetupVars; - EFI_PLATFORM_INFO_HOB *PlatformInfoHob =3D NULL; EFI_PEI_HOB_POINTERS Hob; =20 DEBUG ((EFI_D_INFO, "*** Minnow Board 3 DramCreatePolicyDefaults\n")); @= @ -279,7 +278,7 @@ Mb3DramCreatePolicyDefaults ( // Hob.Raw =3D GetFirstGuidHob (&gEfiPlatformInfoGuid); ASSERT (Hob.Raw !=3D NULL); - PlatformInfoHob =3D GET_GUID_HOB_DATA (Hob.Raw); + =20 DEBUG ((EFI_D_INFO, "Minnow has single rank memory\n")); DramPolicy->DualRankSupportEnabled =3D FALSE; diff --git a/Platform/Brox= tonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitPreMem.inf b/Pla= tform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitPreMem= .inf index 9135fb861..9b71a571c 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardI= nitPreMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/Boa +++ rdInitPreMem.inf @@ -39,7 +39,7 @@ IntelFsp2Pkg/IntelFsp2Pkg.dec BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/IntelFsp2Wrappe= rPkg.dec IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec - Silicon\BroxtonSoC\BroxtonSiPkg\NorthCluster\MemoryInit\MemoryInit.dec + =20 + Silicon/BroxtonSoC/BroxtonSiPkg/NorthCluster/MemoryInit/MemoryInit.dec =20 [Pcd] gPlatformModuleTokenSpaceGuid.PcdBoardId -- 2.11.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel