From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 0856521A0BA9B for ; Thu, 11 May 2017 22:47:20 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP; 11 May 2017 22:47:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,328,1491289200"; d="scan'208";a="86673537" Received: from zwei4-mobl.ccr.corp.intel.com ([10.239.197.154]) by orsmga004.jf.intel.com with ESMTP; 11 May 2017 22:47:19 -0700 From: zwei4 To: edk2-devel@lists.01.org Date: Fri, 12 May 2017 13:47:16 +0800 Message-Id: <20170512054716.27924-1-david.wei@intel.com> X-Mailer: git-send-email 2.11.0.windows.1 Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Fix some GCC build error. 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: Fri, 12 May 2017 05:47:20 -0000 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: zwei4 --- 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