From 2e497f750976dbe1f40ef7b354eef1ef82c359cc Mon Sep 17 00:00:00 2001
From: Guo Mang <mang.guo@intel.com>
Date: Fri, 27 Apr 2018 15:46:50 +0800
Subject: Upgrading core: Fix GCC build failure

Upgrate core to UDK2018: Fix GCC build failure.

Contributed-under: TianoCore Contribution Agreement 1.1

Signed-off-by: Guo Mang <mang.guo@intel.com>
---
 .../Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c | 36 ++--------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

(limited to 'Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c')

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c
index b260c3518e..e7714d189a 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c
@@ -1,7 +1,7 @@
 /** @file
   This file is SampleCode of the library for Intel PCH PEI Policy initialization.
 
-  Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004 - 2018, 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
@@ -78,7 +78,7 @@ InternalAddVerbTable (
 
 **/
 BOOLEAN
-IseMMCBoot (
+PlatformIseMMCBoot (
   VOID
   )
 {
@@ -102,36 +102,6 @@ IseMMCBoot (
 }
 
 
-/**
-  Check it's SPI boot path or not.
-
-  @retval TRUE                       SPI Boot path
-  @retval FALSE                      Not SPI boot path
-
-**/
-BOOLEAN
-IsSpiBoot (
-  VOID
-  )
-{
-  VOID                                  *HobList;
-  MBP_CURRENT_BOOT_MEDIA                *BootMediaData;
-
-  DEBUG ((EFI_D_INFO, "IsSpiBoot Start!\n"));
-  HobList = GetFirstGuidHob (&gEfiBootMediaHobGuid);
-  if (HobList != NULL) {
-    DEBUG ((EFI_D_INFO, "IsSpiBoot HobList != NULL\n"));
-    BootMediaData = GET_GUID_HOB_DATA (HobList);
-    if (BootMediaData->PhysicalData == BOOT_FROM_SPI) {
-      DEBUG ((EFI_D_INFO, "BootMediaData->PhysicalData ==  IsSpiBoot\n"));
-      return TRUE;
-    } else {
-      DEBUG ((EFI_D_INFO, "Not boot from SPI\n"));
-      return FALSE;
-    }
-  }
-  return FALSE;
-}
 
 /**
   Calculate the Address of Boot Partition 1.
@@ -662,7 +632,7 @@ UpdatePeiScPolicy (
   ScsConfig->SccEmmcTraceLength = SCC_EMMC_LONG_TRACE_LEN;
 
   if (SystemConfiguration.ScceMMCEnabled == DEVICE_AUTO) {
-    if (IseMMCBoot ()) {
+    if (PlatformIseMMCBoot ()) {
       ScsConfig->EmmcEnable = DEVICE_ENABLE;
     } else {
       ScsConfig->EmmcEnable = DEVICE_DISABLE;
-- 
cgit v1.2.3