public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: zwei4 <david.wei@intel.com>
To: edk2-devel@lists.01.org
Subject: [Patch][edk2-platforms/devel-MinnowBoard3] Fixed some GCC build errors.
Date: Thu, 11 May 2017 11:37:29 +0800	[thread overview]
Message-ID: <20170511033729.27528-1-david.wei@intel.com> (raw)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
---
 .../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/BoardGpios.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/BoardInit.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/BoardInit.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/BoardInit.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/BoardInitPreMem.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/BoardGpios.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/BoardInit.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/BoardInit.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/BoardInit.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/BoardInitMiscs.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/BoardInitPreMem.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



             reply	other threads:[~2017-05-11  3:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-11  3:37 zwei4 [this message]
2017-05-11  6:25 ` [Patch][edk2-platforms/devel-MinnowBoard3] Fixed some GCC build errors Lu, ShifeiX A
  -- strict thread matches above, loose matches on Subject: below --
2017-05-11  2:24 zwei4

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170511033729.27528-1-david.wei@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox