1. Patchew
  2. EDK2
  3. View series

[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Fix some GCC build error.

zwei4 posted 1 patch 7 years, 5 months ago
Failed in applying to current master (apply log)
Platform/BroxtonPlatformPkg/BuildBios.sh                              | 2 +-
.../DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c     | 2 +-
.../Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c    | 4 ++--
Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc                     | 2 +-
.../SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c  | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Fix some GCC build error.
Posted by zwei4 7 years, 5 months ago 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
---
 Platform/BroxtonPlatformPkg/BuildBios.sh                              | 2 +-
 .../DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c     | 2 +-
 .../Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c    | 4 ++--
 Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc                     | 2 +-
 .../SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/BuildBios.sh
index 8702fbeaa..3963c887a 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBios.sh
@@ -211,7 +211,7 @@ fi
 ## Additional EDK Build Setup/Configuration
 ##**********************************************************************
 echo "Ensuring correct build directory is present for GenBiosId..."
-ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgX64.dsc
+ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgX64Gcc.dsc
 #TOOL_CHAIN_TAG=GCC47
 MAX_CONCURRENT_THREAD_NUMBER=1
 sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt
diff --git a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c
index 4474eafaf..b7b57c517 100644
--- a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c
@@ -33,7 +33,7 @@ CallFspWrapperResetSystem (
   IN UINT32    ResetType
   )
 {
-  EFI_RESET_TYPE             EfiResetType;
+  EFI_RESET_TYPE             EfiResetType = EfiResetCold;
 
   switch (ResetType) {
     case FSP_STATUS_RESET_REQUIRED_COLD:
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
index 630c2c1d1..d7ef4970b 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
@@ -893,7 +893,7 @@ PlatformInitPreMemEntryPoint (
   DRAM_POLICY_PPI                  *DramPolicy;
   EFI_PEI_PPI_DESCRIPTOR           *NewPeiPpiDescriptor;
   EFI_BOOT_MODE                    BootMode;
-  CarMapStruc                      *CarMap;
+  CarMapStruc                      *CarMap = NULL;
   SYSTEM_CONFIGURATION             SystemConfiguration;
   UINTN                            VariableSize;
   EFI_PEI_HOB_POINTERS             Hob;
@@ -938,7 +938,7 @@ PlatformInitPreMemEntryPoint (
                  &gBoardPreMemInitPpiGuid,
                  Instance,
                  &PeiPpiDescriptor,
-                 &BoardPreMemInitPpi
+                 (VOID **)&BoardPreMemInitPpi
                  );
 
       if (Status == EFI_NOT_FOUND) {
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
index 1339b44b2..42f068a38 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
@@ -177,5 +177,5 @@
 #[BuildOptions.Common]
 
 [BuildOptions.Common.EDKII]
-   !include PlatformDsc/BuildOptions.EDKII.dsc
+   !include PlatformDsc/BuildOptions.EDKII.Gcc.dsc
 
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 9fcb55197..316e5c745 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -1122,7 +1122,7 @@ Reclaim (
   VARIABLE_POINTER_TRACK        VarErrFlagPtr;
 
   Status = EFI_SUCCESS;
-
+  VariableSize = 0;
   UpdatingVariable            = NULL;
   UpdatingInDeletedTransition = NULL;
 
-- 
2.11.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Fix some GCC build error.
Posted by Lu, ShifeiX A 7 years, 5 months ago 
Reviewed-by: lushifex <shifeix.a.lu@intel.com>


Shifei

-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of zwei4
Sent: Friday, May 12, 2017 1:47 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Fix some GCC build error.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
---
 Platform/BroxtonPlatformPkg/BuildBios.sh                              | 2 +-
 .../DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c     | 2 +-
 .../Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c    | 4 ++--
 Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc                     | 2 +-
 .../SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/BuildBios.sh
index 8702fbeaa..3963c887a 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBios.sh
@@ -211,7 +211,7 @@ fi
 ## Additional EDK Build Setup/Configuration
 ##**********************************************************************
 echo "Ensuring correct build directory is present for GenBiosId..."
-ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgX64.dsc
+ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgX64Gcc.dsc
 #TOOL_CHAIN_TAG=GCC47
 MAX_CONCURRENT_THREAD_NUMBER=1
 sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt diff --git a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c
index 4474eafaf..b7b57c517 100644
--- a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrappe
+++ rPlatformResetLib/DxeFspWrapperPlatformResetLib.c
@@ -33,7 +33,7 @@ CallFspWrapperResetSystem (
   IN UINT32    ResetType
   )
 {
-  EFI_RESET_TYPE             EfiResetType;
+  EFI_RESET_TYPE             EfiResetType = EfiResetCold;
 
   switch (ResetType) {
     case FSP_STATUS_RESET_REQUIRED_COLD:
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
index 630c2c1d1..d7ef4970b 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMem
+++ Pei/PlatformInitPreMem.c
@@ -893,7 +893,7 @@ PlatformInitPreMemEntryPoint (
   DRAM_POLICY_PPI                  *DramPolicy;
   EFI_PEI_PPI_DESCRIPTOR           *NewPeiPpiDescriptor;
   EFI_BOOT_MODE                    BootMode;
-  CarMapStruc                      *CarMap;
+  CarMapStruc                      *CarMap = NULL;
   SYSTEM_CONFIGURATION             SystemConfiguration;
   UINTN                            VariableSize;
   EFI_PEI_HOB_POINTERS             Hob;
@@ -938,7 +938,7 @@ PlatformInitPreMemEntryPoint (
                  &gBoardPreMemInitPpiGuid,
                  Instance,
                  &PeiPpiDescriptor,
-                 &BoardPreMemInitPpi
+                 (VOID **)&BoardPreMemInitPpi
                  );
 
       if (Status == EFI_NOT_FOUND) {
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
index 1339b44b2..42f068a38 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
@@ -177,5 +177,5 @@
 #[BuildOptions.Common]
 
 [BuildOptions.Common.EDKII]
-   !include PlatformDsc/BuildOptions.EDKII.dsc
+   !include PlatformDsc/BuildOptions.EDKII.Gcc.dsc
 
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 9fcb55197..316e5c745 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/
+++ Variable/RuntimeDxe/Variable.c
@@ -1122,7 +1122,7 @@ Reclaim (
   VARIABLE_POINTER_TRACK        VarErrFlagPtr;
 
   Status = EFI_SUCCESS;
-
+  VariableSize = 0;
   UpdatingVariable            = NULL;
   UpdatingInDeletedTransition = NULL;
 
--
2.11.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.