Reviewed-by: lushifex <[email protected]>
Shifei -----Original Message----- From: edk2-devel [mailto:[email protected]] On Behalf Of zwei4 Sent: Thursday, May 11, 2017 11:37 AM To: [email protected] Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fixed some GCC build errors. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: zwei4 <[email protected]> --- .../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 +-- .../MinnowBoard3/BoardInitPreMem/BoardInitMiscs.c | 3 +- .../BoardInitPreMem/BoardInitPreMem.inf | 2 +- 11 files changed, 50 insertions(+), 53 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c index 96d325c45..971c192cd 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardG +++ pios.c @@ -1,7 +1,7 @@ /** @file Gpio setting for multiplatform. - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2010 - 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 @@ -151,29 +151,28 @@ MultiPlatformGpioProgram ( ) { UINTN VariableSize; - EFI_STATUS Status; EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariableServices; SYSTEM_CONFIGURATION SystemConfiguration; VariableSize = sizeof (SYSTEM_CONFIGURATION); ZeroMem (&SystemConfiguration, sizeof (SYSTEM_CONFIGURATION)); - Status = (*PeiServices)->LocatePpi ( - PeiServices, - &gEfiPeiReadOnlyVariable2PpiGuid, - 0, - NULL, - (VOID **) &VariableServices - ); - - Status = 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 + ); DEBUG ((DEBUG_INFO, "MultiPlatformGpioProgram()...\n")); diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.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. - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2010 - 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 @@ -26,7 +26,7 @@ EFI_STATUS EFIAPI LeafHillPostMemInitCallback ( - 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 = { 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/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.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. - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2013 - 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 @@ -20,7 +20,7 @@ #include <PiPei.h> #include <Library/IoLib.h> #include <Library/HobLib.h> -#include <Library/Timerlib.h> +#include <Library/TimerLib.h> #include <Guid/PlatformInfo_Aplk.h> VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.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. - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2013 - 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 @@ -20,7 +20,7 @@ #include <PiPei.h> #include <Library/IoLib.h> #include <Library/HobLib.h> -#include <Library/Timerlib.h> +#include <Library/TimerLib.h> #include <Guid/PlatformInfo_Aplk.h> VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitPreMem.inf b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitPreMem.inf index c526bc2c0..12a3441d4 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitPreMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardIn +++ itPreMem.inf @@ -39,7 +39,7 @@ IntelFsp2Pkg/IntelFsp2Pkg.dec BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec - Silicon\BroxtonSoC\BroxtonSiPkg\NorthCluster\MemoryInit\MemoryInit.dec + + Silicon/BroxtonSoC/BroxtonSiPkg/NorthCluster/MemoryInit/MemoryInit.dec [Pcd] gPlatformModuleTokenSpaceGuid.PcdBoardId diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c index 7e7c327cb..67103a4b0 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.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; VariableSize = sizeof (SYSTEM_CONFIGURATION); ZeroMem (&SystemConfiguration, sizeof (SYSTEM_CONFIGURATION)); - Status = (*PeiServices)->LocatePpi ( - PeiServices, - &gEfiPeiReadOnlyVariable2PpiGuid, - 0, - NULL, - (VOID **) &VariableServices - ); - - Status = 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 + ); DEBUG ((DEBUG_INFO, "MultiPlatformGpioProgram()...\n")); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c index 0291d150f..114c3c9ac 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Bo +++ ardInit.c @@ -1,7 +1,7 @@ /** @file Board Init driver. - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2010 - 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 @@ -26,7 +26,7 @@ EFI_STATUS EFIAPI MinnowBoard3PostMemInitCallback ( - 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 = { 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/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.h index 373b20312..fa3919e3c 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.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. - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2013 - 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 @@ -20,7 +20,7 @@ #include <PiPei.h> #include <Library/IoLib.h> #include <Library/HobLib.h> -#include <Library/Timerlib.h> +#include <Library/TimerLib.h> #include <Guid/PlatformInfo_Aplk.h> VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.h index 373b20312..fa3919e3c 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.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. - Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2013 - 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 @@ -20,7 +20,7 @@ #include <PiPei.h> #include <Library/IoLib.h> #include <Library/HobLib.h> -#include <Library/Timerlib.h> +#include <Library/TimerLib.h> #include <Guid/PlatformInfo_Aplk.h> VOID GpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitMiscs.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitMiscs.c index 997046ac0..7e0b52560 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitMiscs.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/Boa +++ rdInitMiscs.c @@ -140,7 +140,6 @@ Mb3DramCreatePolicyDefaults ( UINT8 (*ChSwizlePtr)[DRAM_POLICY_NUMBER_CHANNELS][DRAM_POLICY_NUMBER_BITS]; PlatfromDramConf *DramConfig; BOOLEAN ReadSetupVars; - EFI_PLATFORM_INFO_HOB *PlatformInfoHob = NULL; EFI_PEI_HOB_POINTERS Hob; DEBUG ((EFI_D_INFO, "*** Minnow Board 3 DramCreatePolicyDefaults\n")); @@ -279,7 +278,7 @@ Mb3DramCreatePolicyDefaults ( // Hob.Raw = GetFirstGuidHob (&gEfiPlatformInfoGuid); ASSERT (Hob.Raw != NULL); - PlatformInfoHob = GET_GUID_HOB_DATA (Hob.Raw); + DEBUG ((EFI_D_INFO, "Minnow has single rank memory\n")); DramPolicy->DualRankSupportEnabled = FALSE; diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitPreMem.inf b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitPreMem.inf index 9135fb861..9b71a571c 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitPreMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/Boa +++ rdInitPreMem.inf @@ -39,7 +39,7 @@ IntelFsp2Pkg/IntelFsp2Pkg.dec BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec - Silicon\BroxtonSoC\BroxtonSiPkg\NorthCluster\MemoryInit\MemoryInit.dec + + Silicon/BroxtonSoC/BroxtonSiPkg/NorthCluster/MemoryInit/MemoryInit.dec [Pcd] gPlatformModuleTokenSpaceGuid.PcdBoardId -- 2.11.0.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
