summaryrefslogtreecommitdiff
path: root/Platform/BroxtonPlatformPkg
diff options
context:
space:
mode:
Diffstat (limited to 'Platform/BroxtonPlatformPkg')
-rw-r--r--Platform/BroxtonPlatformPkg/BuildBios.sh2
-rw-r--r--Platform/BroxtonPlatformPkg/Common/FspSupport/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c2
-rw-r--r--Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c4
-rw-r--r--Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc2
4 files changed, 5 insertions, 5 deletions
diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/BuildBios.sh
index 8702fbeaa7..3963c887a2 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 4474eafaf8..b7b57c5171 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 630c2c1d1b..d7ef4970b8 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 1339b44b28..42f068a38e 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