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>
---
 BuildBIOS.sh                                       |  13 +--
 .../Board/AuroraGlacier/BoardInitPostMem/TypeC.c   |  34 +++----
 Platform/BroxtonPlatformPkg/BuildBxtBios.sh        |  94 +++++++++---------
 Platform/BroxtonPlatformPkg/BuildIFWI.sh           |   4 +-
 .../Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c |  36 +------
 .../IntelFsp2WrapperPkg/FspInitPei/SecMain.c       |   6 +-
 .../IntelFsp2WrapperPkg/FspInitPei/SecMain.h       |   4 +-
 .../SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S  |   8 +-
 .../Ia32/SecEntry.asm                              |   8 +-
 .../Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c     |  38 ++++----
 .../BroxtonPlatformPkg/PlatformDsc/Components.dsc  |  26 ++++-
 Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc  |  12 +--
 .../MdeModulePkg/Universal/Variable/Pei/Variable.c | 105 ++++++++++-----------
 .../SouthCluster/Library/I2CLibPei/I2CDelayPei.c   |  28 +-----
 .../Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c  |  60 +-----------
 .../Txe/Library/Private/PeiSeCUma/SeCUma.c         |  33 +------
 16 files changed, 195 insertions(+), 314 deletions(-)

diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index 91d6bd63d3..5cf0777da7 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 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
 # which accompanies this distribution.  The full text of the license may be found at
@@ -108,12 +108,13 @@ fi
 echo $Build_Flags
 echo $Target_Flag
 
+cd ..
 export WORKSPACE=`pwd`
-export PACKAGES_PATH=$WORKSPACE:$WORKSPACE/Core:$WORKSPACE/Silicon/:$WORKSPACE/Platform:$WORKSPACE/Platform/BroxtonPlatformPkg:$WORKSPACE/Silicon/BroxtonSoC:$WORKSPACE/Platform/BroxtonPlatformPkg/Common
+export CORE_PATH=$WORKSPACE/edk2
+export PACKAGES_PATH=$WORKSPACE:$WORKSPACE/edk2:$WORKSPACE/edk2-platforms/:$WORKSPACE/edk2-platforms/Platform:$WORKSPACE/edk2-platforms/Platform/BroxtonPlatformPkg:$WORKSPACE/edk2-platforms/Silicon/BroxtonSoC:$WORKSPACE/edk2-platforms/Silicon:$WORKSPACE/edk2-platforms/Platform/BroxtonPlatformPkg/Common
 
-. edksetup.sh BaseTools
+make -C $CORE_PATH/BaseTools
+source $CORE_PATH/edksetup.sh BaseTools
 
-make -C BaseTools
-
-bash ./Platform/BroxtonPlatformPkg/BuildIFWI.sh $Build_Flags Broxton $Target_Flag
+bash ./edk2-platforms/Platform/BroxtonPlatformPkg/BuildIFWI.sh $Build_Flags Broxton $Target_Flag
 
diff --git a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c
index 36419ec230..2513738261 100644
--- a/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c
+++ b/Platform/BroxtonPlatformPkg/Board/AuroraGlacier/BoardInitPostMem/TypeC.c
@@ -31,7 +31,7 @@ static MUX_PROGRAMMING_TABLE mAuroraMuxTable[] = {
 };
 
 VOID
-PrintChar (
+AgPrintChar (
   IN UINTN     DebugMask,
   IN UINTN     Count,
   IN CHAR16   *Char
@@ -47,7 +47,7 @@ PrintChar (
 #define DIVIDING_LINE "+----------------------------------------------------+------------------+\n"
 
 VOID
-DumpParagraph (
+AgDumpParagraph (
   IN   UINTN   DebugMask,
   IN   VOID   *Ptr,
   IN   UINTN   Count
@@ -88,12 +88,12 @@ DumpParagraph (
     //
     // Print header
     //
-    PrintChar (DebugMask, PlaceHolders + 5, L" ");
+    AgPrintChar (DebugMask, PlaceHolders + 5, L" ");
     DEBUG ((DebugMask, DIVIDING_LINE));
-    PrintChar (DebugMask, PlaceHolders + 5, L" ");
+    AgPrintChar (DebugMask, PlaceHolders + 5, L" ");
     DEBUG ((DebugMask, "| x0 x1 x2 x3  x4 x5 x6 x7  x8 x9 xA xB  xC xD xE xF |      String      |\n"));
     DEBUG ((DebugMask, " +"));
-    PrintChar (DebugMask, PlaceHolders + 3, L"-");
+    AgPrintChar (DebugMask, PlaceHolders + 3, L"-");
     DEBUG ((DebugMask, DIVIDING_LINE));
     //
     // Print data
@@ -105,7 +105,7 @@ DumpParagraph (
       if (Index % 0x10 == 0x00) {
         if ((Index > 0) && ((Index / 0x10) % 0x04 == 0x00) && (Paragraphs > 6)) {
           DEBUG ((DebugMask, " +"));
-          PrintChar (DebugMask, PlaceHolders + 3, L"-");
+          AgPrintChar (DebugMask, PlaceHolders + 3, L"-");
           DEBUG ((DebugMask, DIVIDING_LINE));
         }
         DEBUG ((DebugMask, " | %0*xx | ", PlaceHolders, (Index / 0x10)));
@@ -144,14 +144,14 @@ DumpParagraph (
     // Print footer
     //
     DEBUG ((DebugMask, " +"));
-    PrintChar (DebugMask, PlaceHolders + 3, L"-");
+    AgPrintChar (DebugMask, PlaceHolders + 3, L"-");
     DEBUG ((DebugMask, DIVIDING_LINE));
   }
 }
 
 EFI_STATUS
 EFIAPI
-ReadMux (
+AgReadMux (
   IN   UINT8    SlaveAddress,
   IN   UINT8    Offset,
   OUT  UINT8   *Data
@@ -171,7 +171,7 @@ ReadMux (
 
 EFI_STATUS
 EFIAPI
-WriteMux (
+AgWriteMux (
   IN   UINT8    SlaveAddress,
   IN   UINT8    Offset,
   OUT  UINT8   *Data
@@ -189,7 +189,7 @@ WriteMux (
 }
 
 VOID
-DumpMux (
+AgDumpMux (
   VOID
   )
 {
@@ -206,11 +206,11 @@ DumpMux (
   DEBUG ((DEBUG_INFO, "\n%a(#%d) - Dump the PS8750 I2C data\n", __FUNCTION__, __LINE__));
   for (SlaveAddress = 0x08; SlaveAddress <= 0x0E; SlaveAddress++) {
     for (Offset = 0x00; Offset <= 0xFF; Offset++) {
-      Status = ReadMux (SlaveAddress, (UINT8) Offset, &Data[Offset]);
+      Status = AgReadMux (SlaveAddress, (UINT8) Offset, &Data[Offset]);
       if (EFI_ERROR (Status)) Data[Offset] = 0xFF;
     }
     DEBUG ((DEBUG_INFO, "\nSlaveAddress = 0x%02x\n", (SlaveAddress << 1)));
-    DumpParagraph (DEBUG_INFO, Data, 256);
+   AgDumpParagraph (DEBUG_INFO, Data, 256);
   }
   DEBUG ((DEBUG_INFO, "\n"));
   padConfg0.padCnf0 = GpioPadRead (NW_GPIO_199 + BXT_GPIO_PAD_CONF0_OFFSET);
@@ -220,7 +220,7 @@ DumpMux (
 
 EFI_STATUS
 EFIAPI
-SetupTypecMuxAux (
+AgSetupTypecMuxAux (
   VOID
   )
 {
@@ -237,16 +237,16 @@ SetupTypecMuxAux (
   //
   Ptr = (UINT8 *) &MuxData;
   for (index = 0; index < (sizeof (mAuroraMuxTable) / sizeof (mAuroraMuxTable[0])); index++) {
-    Status = ReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8);
+    Status = AgReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8);
     DEBUG ((DEBUG_INFO, "%a(#%d) - %.*a [0x%02x:0x%02x] = 0x%02x (%r)\n", __FUNCTION__, __LINE__, MUX_TABLE_STRING_LENGTH, mAuroraMuxTable[index].String, (mAuroraMuxTable[index].Address << 1), mAuroraMuxTable[index].Register, Data8, Status));
     Ptr[index] = Data8;
     if ((mAuroraMuxTable[index].Data != MUX_TABLE_NULL) && (!EFI_ERROR (Status))) {
       Data8 = (UINT8) (mAuroraMuxTable[index].Data & 0x00FF);
-      Status = WriteMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8);
+      Status = AgWriteMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8);
       if (EFI_ERROR (Status)) {
         DEBUG ((DEBUG_ERROR, "%a(#%d) - ERROR: ByteWriteI2C returned %r for %a = 0x%02x\n", __FUNCTION__, __LINE__, Status, mAuroraMuxTable[index].String, Data8));
       } else {
-        Status = ReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8);
+        Status = AgReadMux (mAuroraMuxTable[index].Address, mAuroraMuxTable[index].Register, &Data8);
         DEBUG ((DEBUG_INFO, "%a(#%d) - %.*a [0x%02x:0x%02x] = 0x%02x (%r)\n", __FUNCTION__, __LINE__, MUX_TABLE_STRING_LENGTH, mAuroraMuxTable[index].String, (mAuroraMuxTable[index].Address << 1), mAuroraMuxTable[index].Register, Data8, Status));
         Ptr[index] = Data8;
       }
@@ -272,7 +272,7 @@ SetupTypecMuxAux (
       // We need to assert the MUX HPD
       //
       Data8  = MuxData.HpdAssert | BIT7;
-      Status = WriteMux (A_STATUS,  R_MUX_HPD_ASSERT, &Data8);
+      Status = AgWriteMux (A_STATUS,  R_MUX_HPD_ASSERT, &Data8);
 
       //
       // Display HPD
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index fc5a6e2ab1..6358eeb8aa 100755
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@ -69,13 +69,17 @@ if [ -e $(pwd)/FlashMap.h ]; then
   rm $(pwd)/FlashMap.h
 fi
 
+if [ ! -d $(pwd)/Conf ]; then
+  mkdir Conf
+fi
+
 ## Override tools_def.txt
 #cp $WORKSPACE\BaseTools\Conf\tools_def.template $WORKSPACE\Conf\tools_def.txt
 #:: Override tools_def.txt
 echo Creating Conf folder and build config files...
-cp $WORKSPACE/BaseTools/Conf/target.template $WORKSPACE/Conf/target.txt
-cp $WORKSPACE/BaseTools/Conf/tools_def.template $WORKSPACE/Conf/tools_def.txt
-cp $WORKSPACE/BaseTools/Conf/build_rule.template $WORKSPACE/Conf/build_rule.txt
+cp $CORE_PATH/BaseTools/Conf/target.template $WORKSPACE/Conf/target.txt
+cp $CORE_PATH/BaseTools/Conf/tools_def.template $WORKSPACE/Conf/tools_def.txt
+cp $CORE_PATH/BaseTools/Conf/build_rule.template $WORKSPACE/Conf/build_rule.txt
 
 
 
@@ -84,7 +88,10 @@ TOOL_CHAIN_TAG=GCC5
 
 ## Define platform specific environment variables.
 PLATFORM_NAME=BroxtonPlatformPkg
-PLATFORM_PACKAGE=Platform/BroxtonPlatformPkg
+PLATFORM_PACKAGE=edk2-platforms/Platform/BroxtonPlatformPkg
+PLATFORM_PATH=$WORKSPACE/edk2-platforms
+CORE_PATH=$WORKSPACE/edk2
+SILICON_PATH=edk2-platforms/Silicon/BroxtonSoC
 EFI_SOURCE=$WORKSPACE
 EDK_SOURCE=$WORKSPACE
 
@@ -156,7 +163,7 @@ fi
 
 ENBDT_PF_BUILD=TRUE
 PLATFORM_NAME=BroxtonPlatformPkg
-PLATFORM_PACKAGE=Platform/BroxtonPlatformPkg  
+PLATFORM_PACKAGE=edk2-platforms/Platform/BroxtonPlatformPkg  
 Platform_Type=$1
 
 ## Create new DefineAtBuildMacros.dsc file
@@ -271,7 +278,7 @@ fi
 if [ -e "$BUILD_PATH/$Arch/BiosId.bin" ]; then
   rm -f $BUILD_PATH/$Arch/BiosId.bin
 fi
-./Platform/BroxtonPlatformPkg/Common/Tools/GenBiosId/GenBiosId -i Conf/BiosId.env -o $BUILD_PATH/$Arch/BiosId.bin
+edk2-platforms/Platform/BroxtonPlatformPkg/Common/Tools/GenBiosId/GenBiosId -i Conf/BiosId.env -o $BUILD_PATH/$Arch/BiosId.bin
 
 
 echo
@@ -281,7 +288,7 @@ echo "**** Due to nasm can't execute in Ubuntu ****"
 
 echo "Invoking EDK2 build..."
 
-build $Build_Flags
+build -t ${TOOL_CHAIN_TAG} $Build_Flags
 
 echo "check if Build was successful"
 
@@ -294,13 +301,13 @@ grep "_PCD_VALUE_" $BUILD_PATH/IA32/BroxtonPlatformPkg/Common/PlatformSettings/P
 # FSP Rebase and Split
 #
 #   0xFEF7A000 = gIntelFsp2WrapperTokenSpaceGuid.PcdFlashFvFspBase = $(CAR_BASE_ADDRESS) + $(BLD_RAM_DATA_SIZE) + $(FSP_RAM_DATA_SIZE) + $(FSP_EMP_DATA_SIZE) + $(BLD_IBBM_SIZE)
-pushd  $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin
-python $WORKSPACE/Core/IntelFsp2Pkg/Tools/SplitFspBin.py rebase -f Fsp.fd -c m -b 0xFEF7A000 -o ./ -n ApolloLakeFsp.fd
-python $WORKSPACE/Core/IntelFsp2Pkg/Tools/SplitFspBin.py split -f ApolloLakeFsp.fd -o ./ -n FSP.Fv
+pushd  $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin
+python $CORE_PATH/IntelFsp2Pkg/Tools/SplitFspBin.py rebase -f Fsp.fd -c m -b 0xFEF7A000 -o ./ -n ApolloLakeFsp.fd
+python $CORE_PATH/IntelFsp2Pkg/Tools/SplitFspBin.py split -f ApolloLakeFsp.fd -o ./ -n FSP.Fv
 popd
-cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_T.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_M.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-cp -f $WORKSPACE/Silicon/BroxtonSoC/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_S.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+cp -f $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_T.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch
+cp -f $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_M.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch
+cp -f $SILICON_PATH/BroxtonFspPkg/ApolloLakeFspBinPkg/FspBin/FSP_S.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch
 
 echo "Running fce..."
 cat $BUILD_PATH/FV/FVIBBM.Fv $BUILD_PATH/FV/SOC.fd > $BUILD_PATH/FV/Temp.fd
@@ -323,7 +330,7 @@ Split -f $BUILD_PATH/FV/Bxt"$Arch".fd -s 0x35000 -o $BUILD_PATH/FV/FVIBBM.Fv
 VERSION_MAJOR=$(grep '^VERSION_MAJOR' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-4)
 VERSION_MINOR=$(grep '^VERSION_MINOR' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-2)
 BIOS_Name="$BOARD_ID""$BOARD_REV""$SV_String""$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR"
-cp $BUILD_PATH/FV/SOC.fd $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name.ROM
+cp $BUILD_PATH/FV/SOC.fd $PLATFORM_PACKAGE/Common/Tools/Stitch/$BIOS_Name.ROM
 
 echo Get NvStorage Base and Size...
 if [ -e $(pwd)/FlashMap.h ]; then
@@ -342,7 +349,7 @@ if [ -e $(pwd)/FlashMap.h ]; then
 
   #Create NvStorage.fv
   echo Create NvStorage.fv...
-  pushd $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+  pushd $PLATFORM_PACKAGE/Common/Tools/Stitch
   Split -f $BIOS_Name.ROM -s $VpdOffset -o temp1.bin -t temp2.bin
   Split -f temp2.bin -s $VpdSize -o NvStorage.Fv -t temp3.bin
   rm temp1.bin temp2.bin temp3.bin
@@ -353,60 +360,59 @@ else
 fi
 
 
-cp -f $BUILD_PATH/FV/FVOBB.Fv  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-cp -f $BUILD_PATH/FV/FVOBBX.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-cp -f $BUILD_PATH/FV/FVIBBR.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-cp -f $BUILD_PATH/FV/FVIBBM.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-cp -f $BUILD_PATH/FV/FVIBBL.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-
+cp -f $BUILD_PATH/FV/FVOBB.Fv  $PLATFORM_PACKAGE/Common/Tools/Stitch
+cp -f $BUILD_PATH/FV/FVOBBX.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch
+cp -f $BUILD_PATH/FV/FVIBBR.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch
+cp -f $BUILD_PATH/FV/FVIBBM.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch
+cp -f $BUILD_PATH/FV/FVIBBL.Fv $PLATFORM_PACKAGE/Common/Tools/Stitch
 if [ $BoardId == "BG" ]; then
   if [ $FabId == "B" ]; then
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk1.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk2.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk3.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk1.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk2.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk3.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
   else 
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk1.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk2.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk3.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk1.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk2.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk3.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
   fi
 fi
 
 if [ $BoardId == "MN" ]; then
   if [ $FabId == "B" ]; then
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk1.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk2.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk3.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk1.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk2.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk3.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
   else
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk1.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk2.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk3.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk1.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk2.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk3.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
   fi
 fi
 
 if [ $BoardId == "MX" ]; then
   if [ $FabId == "B" ]; then
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk1.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk2.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk3.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk1.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk2.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk3.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
   else
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk1.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk2.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk3.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk1.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk2.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk3.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
   fi
 fi
 
 if [ $BoardId == "LH" ]; then
   if [ $FabId == "D" ]; then
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk1.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk2.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
-    cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk3.bin  $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk1.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk2.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+    cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk3.bin  $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
   fi
 fi
 
 #
 # Assmeble components
 #
-pushd $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+pushd $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
 
 cat FVIBBL.Fv > IBBL.Fv
 
@@ -420,6 +426,6 @@ popd
 
 echo
 echo Check if SPI IFWI image is generated at below location:
-echo $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name"_GCC".bin
+echo $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/$BIOS_Name"_GCC".bin
 echo
 echo
diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
index 6138fb4810..cca9c34eda 100755
--- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh
+++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 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
 # which accompanies this distribution.  The full text of the license may be found at
@@ -115,7 +115,7 @@ fi
 ## Build BIOS
 echo "======================================================================"
 echo "Build_IFWI:  Calling BIOS build Script..."
-bash Platform/BroxtonPlatformPkg/BuildBxtBios.sh $Build_Flags $Platform_Type $Build_Target
+bash edk2-platforms/Platform/BroxtonPlatformPkg/BuildBxtBios.sh $Build_Flags $Platform_Type $Build_Target
 
 echo
 echo Finished Building Process.
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;
diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c
index 05816c5a65..06fab9e3a8 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.c
@@ -1,7 +1,7 @@
 /** @file
   C functions in SEC.
 
-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 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
@@ -30,7 +30,7 @@ EFI_PEI_PPI_DESCRIPTOR            mPeiSecMainPpi[] = {
 };
 
 FSP_SILICON_INIT_DONE_PPI gFspSiliconInitDonePpi = {
-  FspSiliconInitDoneGetFspHobList
+  SecMainFspSiliconInitDoneGetFspHobList
 };
 
 //
@@ -285,7 +285,7 @@ SecStartupPhase2(
 **/
 EFI_STATUS
 EFIAPI
-FspSiliconInitDoneGetFspHobList (
+SecMainFspSiliconInitDoneGetFspHobList (
   IN  CONST EFI_PEI_SERVICES         **PeiServices,
   IN  FSP_SILICON_INIT_DONE_PPI      *This,
   OUT VOID                           **FspHobList
diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h
index 68688c5cbd..b6e59e260e 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspInitPei/SecMain.h
@@ -1,7 +1,7 @@
 /** @file
   Master header file for SecCore.
 
-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 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
@@ -106,7 +106,7 @@ ProcessLibraryConstructorList (
 **/
 EFI_STATUS
 EFIAPI
-FspSiliconInitDoneGetFspHobList (
+SecMainFspSiliconInitDoneGetFspHobList (
   IN  CONST EFI_PEI_SERVICES         **PeiServices,
   IN  FSP_SILICON_INIT_DONE_PPI      *This,
   OUT VOID                           **FspHobList
diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S
index c7870fe42e..03d0126e60 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.S
@@ -2,7 +2,7 @@
 #  This is the code that goes from real-mode to protected mode.
 #  It consumes the reset vector, calls TempRamInit API from FSP binary.
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 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
@@ -23,7 +23,7 @@ ASM_GLOBAL ASM_PFX(_TEXT_REALMODE)
 ASM_PFX(_TEXT_REALMODE):
 #----------------------------------------------------------------------------
 #
-# Procedure:    _ModuleEntryPoint
+# Procedure:    _SecEntryModuleEntryPoint
 #
 # Input:        None
 #
@@ -51,8 +51,8 @@ ASM_PFX(_TEXT_REALMODE):
 #----------------------------------------------------------------------------
 
 .align 4
-ASM_GLOBAL ASM_PFX(_ModuleEntryPoint)
-ASM_PFX(_ModuleEntryPoint):
+ASM_GLOBAL ASM_PFX(_SecEntryModuleEntryPoint)
+ASM_PFX(_SecEntryModuleEntryPoint):
   fninit                                # clear any pending Floating point exceptions
   #
   # Store the BIST value in mm0
diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm
index b7958ddf66..40b42f47d9 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/SecEntry.asm
@@ -2,7 +2,7 @@
 ;  This is the code that goes from real-mode to protected mode.
 ;  It consumes the reset vector, calls TempRamInit API from FSP binary.
 ;
-;  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+;  Copyright (c) 2014 - 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
@@ -32,7 +32,7 @@ _TEXT_REALMODE      SEGMENT PARA PUBLIC USE16 'CODE'
 
 ;----------------------------------------------------------------------------
 ;
-; Procedure:    _ModuleEntryPoint
+; Procedure:    _SecEntryModuleEntryPoint
 ;
 ; Input:        None
 ;
@@ -60,7 +60,7 @@ _TEXT_REALMODE      SEGMENT PARA PUBLIC USE16 'CODE'
 ;----------------------------------------------------------------------------
 
 align 4
-_ModuleEntryPoint PROC NEAR C PUBLIC
+_SecEntryModuleEntryPoint PROC NEAR C PUBLIC
   fninit                                ; clear any pending Floating point exceptions
   ;
   ; Store the BIST value in mm0
@@ -111,7 +111,7 @@ _ModuleEntryPoint PROC NEAR C PUBLIC
   mov esi, offset ProtectedModeEntryLinearAddress
   jmp     fword ptr cs:[si]
 
-_ModuleEntryPoint   ENDP
+_SecEntryModuleEntryPoint   ENDP
 _TEXT_REALMODE      ENDS
 
 _TEXT_PROTECTED_MODE      SEGMENT PARA PUBLIC USE32 'CODE'
diff --git a/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c b/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c
index fa04d544f6..874ce7299d 100644
--- a/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Common/SeCPolicyInitDxe/SeCPolicyInitDxe.c
@@ -1,7 +1,7 @@
 /** @file
   SEC policy initialization.
 
-  Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2008 - 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
@@ -24,7 +24,7 @@
 //
 UINT8 mTsDimmSmbusAddress[] = {0x30, 0x34};
 
-DXE_SEC_POLICY_PROTOCOL  mDxePlatformSeCPolicy = { 0 };
+DXE_SEC_POLICY_PROTOCOL  mDxePlatformSeCPolicyProtocol = { 0 };
 
 SEC_OPERATION_PROTOCOL   mSeCOperationProtocol = {
   GetPlatformSeCInfo,
@@ -72,8 +72,8 @@ SeCPlatformPolicyEntryPoint (
 
   DEBUG ((EFI_D_INFO, "SeCPlatformPolicyEntryPoint ++ \n"));
 
-  mDxePlatformSeCPolicy.SeCConfig.TrConfig = AllocateZeroPool (sizeof (TR_CONFIG));
-  if (mDxePlatformSeCPolicy.SeCConfig.TrConfig == NULL) {
+  mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig = AllocateZeroPool (sizeof (TR_CONFIG));
+  if (mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig == NULL) {
     return EFI_OUT_OF_RESOURCES;
   }
 
@@ -88,21 +88,21 @@ SeCPlatformPolicyEntryPoint (
   //
   // ME DXE Policy Init
   //
-  mDxePlatformSeCPolicy.Revision = DXE_PLATFORM_SEC_POLICY_PROTOCOL_REVISION_7;
+  mDxePlatformSeCPolicyProtocol.Revision = DXE_PLATFORM_SEC_POLICY_PROTOCOL_REVISION_7;
 
   //
   // Initialzie the Me Configuration
   //
-  mDxePlatformSeCPolicy.SeCConfig.EndOfPostEnabled        = 1;
-  mDxePlatformSeCPolicy.SeCConfig.HeciCommunication       = 1;
-  mDxePlatformSeCPolicy.SeCConfig.SeCFwDownGrade          = 0;
-  mDxePlatformSeCPolicy.SeCConfig.SeCLocalFwUpdEnabled    = 0;
-  mDxePlatformSeCPolicy.SeCConfig.TrConfig->DimmNumber    = 2;
-  mDxePlatformSeCPolicy.SeCConfig.TrConfig->TrEnabled     = 0;
-  mDxePlatformSeCPolicy.SeCConfig.SeCFwImageType          = INTEL_SEC_1_5MB_FW;
-  mDxePlatformSeCPolicy.SeCConfig.PlatformBrand           = INTEL_STAND_MANAGEABILITY_BRAND;
-  mDxePlatformSeCPolicy.SeCReportError                    = ShowSeCReportError;
-  mDxePlatformSeCPolicy.SeCConfig.ITouchEnabled           = FALSE;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.EndOfPostEnabled        = 1;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.HeciCommunication       = 1;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.SeCFwDownGrade          = 0;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.SeCLocalFwUpdEnabled    = 0;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig->DimmNumber    = 2;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.TrConfig->TrEnabled     = 0;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.SeCFwImageType          = INTEL_SEC_1_5MB_FW;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.PlatformBrand           = INTEL_STAND_MANAGEABILITY_BRAND;
+  mDxePlatformSeCPolicyProtocol.SeCReportError                    = ShowSeCReportError;
+  mDxePlatformSeCPolicyProtocol.SeCConfig.ITouchEnabled           = FALSE;
 
   VarSize = sizeof (SYSTEM_CONFIGURATION);
   Status = gRT->GetVariable (
@@ -114,9 +114,9 @@ SeCPlatformPolicyEntryPoint (
                   );
 
   if (!EFI_ERROR (Status)) {
-    mDxePlatformSeCPolicy.SeCConfig.EndOfPostEnabled = SystemConfiguration.SeCEOPEnable;
+    mDxePlatformSeCPolicyProtocol.SeCConfig.EndOfPostEnabled = SystemConfiguration.SeCEOPEnable;
     if (SystemConfiguration.VirtualKbEnable == TOUCH_INTEGRATED) {
-      mDxePlatformSeCPolicy.SeCConfig.ITouchEnabled=TRUE;
+      mDxePlatformSeCPolicyProtocol.SeCConfig.ITouchEnabled=TRUE;
     }
   }
 
@@ -126,7 +126,7 @@ SeCPlatformPolicyEntryPoint (
   Status = gBS->InstallMultipleProtocolInterfaces (
                   &ImageHandle,
                   &gDxePlatformSeCPolicyGuid,
-                  &mDxePlatformSeCPolicy,
+                  &mDxePlatformSeCPolicyProtocol,
                   &gEfiSeCOperationProtocolGuid,
                   &mSeCOperationProtocol,
                   NULL
@@ -748,7 +748,7 @@ SeCPolicyReadyToBootEvent (
   }
 
   if ((SeCMode == SEC_MODE_NORMAL) && (SEC_STATUS_SEC_STATE_ONLY (SeCStatus) == SEC_READY)) {
-    if (mDxePlatformSeCPolicy.SeCConfig.EndOfPostEnabled == 1) {
+    if (mDxePlatformSeCPolicyProtocol.SeCConfig.EndOfPostEnabled == 1) {
       mSeCInfo.SeCEOPDone = 1;
     }
   }
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
index c6313cdd5d..f1bb26b9d9 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
@@ -47,6 +47,7 @@
       CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
       SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
       MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   }
   
   UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
@@ -76,11 +77,15 @@
 
     !if $(SMM_VARIABLE_ENABLE)
       $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageSmmRuntimeDxe.inf {
+        <LibraryClasses>
+           DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
         <PcdsPatchableInModule>
           gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000103
       }
     !else
       $(PLATFORM_SI_PACKAGE)/VariableStorage/Dxe/CseVariableStorageSmmRuntimeDxe/CseVariableStorageRuntimeDxe.inf {
+        <LibraryClasses>
+          DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
         <PcdsPatchableInModule>
           gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000103
       }
@@ -116,12 +121,16 @@
       NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
       NULL|$(PLATFORM_PACKAGE_COMMON)/Library/Tpm2DeviceLibPtp/Tpm2InstanceLibPtt.inf
   }
-  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
+  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf {
+    <LibraryClasses>
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+    }
   MdeModulePkg/Application/UiApp/UiApp.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   }
 
   $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
@@ -274,6 +283,7 @@
   SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf {
     <LibraryClasses>
       PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   }
 !endif
 
@@ -383,7 +393,10 @@
      NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
   !endif
   !if $(NETWORK_IP6_ENABLE) == TRUE
-     $(PLATFORM_PACKAGE_COMMON)/SampleCode/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+     $(PLATFORM_PACKAGE_COMMON)/SampleCode/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {
+        <LibraryClasses>
+          DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+    }
   !else
      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf {
        <LibraryClasses>
@@ -417,10 +430,12 @@
     MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf {
       <LibraryClasses>
       TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
     }
     MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf {
       <LibraryClasses>
       TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
     }
   !endif
 
@@ -444,6 +459,8 @@
         gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
     }
     MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf {
+      <LibraryClasses>
+        DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
       <PcdsPatchableInModule>
         gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 #0x80000007
       <PcdsFixedAtBuild>
@@ -460,7 +477,10 @@
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
   IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
   $(PLATFORM_PACKAGE_COMMON)/SampleCode/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf {
+    <LibraryClasses>
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  }
 
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf {
     <LibraryClasses>
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
index c24abf47d0..ab15dcc33d 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformPkgX64Gcc.dsc
@@ -1,7 +1,7 @@
 ## @file
 #  Platform description.
 #
-#  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2012 - 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
@@ -58,7 +58,7 @@
   #
   # RC Package
   #
-  !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc
+  !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc
   #
   # Platform
   #
@@ -80,7 +80,7 @@
   #
   # RC Package
   #
-  !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPeiLib.dsc
+  !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPeiLib.dsc
 
   !include PlatformDsc/LibraryClasses.IA32.PEI.dsc
 
@@ -104,7 +104,7 @@
   #
   # RC Package
   #
-  !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxeLib.dsc
+  !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxeLib.dsc
 
 [LibraryClasses.Common.DXE_DRIVER]
   !include PlatformDsc/LibraryClasses.DxeDriver.dsc
@@ -150,11 +150,11 @@
   !include PlatformDsc/PcdsDynamicDefault.Default.dsc
 
 [Components.IA32]
-  !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
+  !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgPei.dsc
   !include PlatformDsc/Components.IA32.dsc
 
 [Components.X64]
-  !include $(WORKSPACE)/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
+  !include $(WORKSPACE)/edk2-platforms/Silicon/$(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc
   !include PlatformDsc/Components.dsc
   $(PLATFORM_SI_PACKAGE)/SouthCluster/ScInit/Dxe/ScInitDxe.inf
 
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/Pei/Variable.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/Pei/Variable.c
index f6c4227069..de1327efcf 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SampleCode/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -2,7 +2,7 @@
   Implement ReadOnly Variable Services required by PEIM and install
   PEI ReadOnly Varaiable2 PPI. These services operates the non volatile storage space.
 
-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 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
@@ -176,7 +176,7 @@ PeimInitializeVariableServices (
 
 **/
 VARIABLE_HEADER *
-GetStartPointer (
+PlatformGetStartPointer (
   IN VARIABLE_STORE_HEADER       *VarStoreHeader
   )
 {
@@ -196,7 +196,7 @@ GetStartPointer (
 
 **/
 VARIABLE_HEADER *
-GetEndPointer (
+PlatformGetEndPointer (
   IN VARIABLE_STORE_HEADER       *VarStoreHeader
   )
 {
@@ -217,7 +217,7 @@ GetEndPointer (
 
 **/
 BOOLEAN
-IsValidVariableHeader (
+PlatformIsValidVariableHeader (
   IN  VARIABLE_HEADER   *Variable
   )
 {
@@ -238,7 +238,7 @@ IsValidVariableHeader (
 
 **/
 UINTN
-GetVariableHeaderSize (
+PlatformGetVariableHeaderSize (
   IN  BOOLEAN       AuthFlag
   )
 {
@@ -264,7 +264,7 @@ GetVariableHeaderSize (
 
 **/
 UINTN
-NameSizeOfVariable (
+PlatformNameSizeOfVariable (
   IN  VARIABLE_HEADER   *Variable,
   IN  BOOLEAN           AuthFlag
   )
@@ -302,7 +302,7 @@ NameSizeOfVariable (
 
 **/
 UINTN
-DataSizeOfVariable (
+PlatformDataSizeOfVariable (
   IN  VARIABLE_HEADER   *Variable,
   IN  BOOLEAN           AuthFlag
   )
@@ -340,12 +340,12 @@ DataSizeOfVariable (
 
 **/
 CHAR16 *
-GetVariableNamePtr (
+PlatformGetVariableNamePtr (
   IN VARIABLE_HEADER    *Variable,
   IN BOOLEAN            AuthFlag
   )
 {
-  return (CHAR16 *) ((UINTN) Variable + GetVariableHeaderSize (AuthFlag));
+  return (CHAR16 *) ((UINTN) Variable + PlatformGetVariableHeaderSize (AuthFlag));
 }
 
 
@@ -359,7 +359,7 @@ GetVariableNamePtr (
 
 **/
 EFI_GUID *
-GetVendorGuidPtr (
+PlatformGetVendorGuidPtr (
   IN VARIABLE_HEADER    *Variable,
   IN BOOLEAN            AuthFlag
   )
@@ -386,7 +386,7 @@ GetVendorGuidPtr (
 
 **/
 UINT8 *
-GetVariableDataPtr (
+PlatformGetVariableDataPtr (
   IN  VARIABLE_HEADER   *Variable,
   IN  VARIABLE_HEADER   *VariableHeader,
   IN  BOOLEAN           AuthFlag
@@ -397,8 +397,8 @@ GetVariableDataPtr (
   //
   // Be careful about pad size for alignment
   //
-  Value =  (UINTN) GetVariableNamePtr (Variable, AuthFlag);
-  Value += NameSizeOfVariable (VariableHeader, AuthFlag);
+  Value =  (UINTN) PlatformGetVariableNamePtr (Variable, AuthFlag);
+  Value += PlatformNameSizeOfVariable (VariableHeader, AuthFlag);
   Value += GET_PAD_SIZE (NameSizeOfVariable (VariableHeader, AuthFlag));
 
   return (UINT8 *) Value;
@@ -416,7 +416,7 @@ GetVariableDataPtr (
 
 **/
 VARIABLE_HEADER *
-GetNextVariablePtr (
+PlatformGetNextVariablePtr (
   IN  VARIABLE_STORE_INFO   *StoreInfo,
   IN  VARIABLE_HEADER       *Variable,
   IN  VARIABLE_HEADER       *VariableHeader
@@ -424,8 +424,8 @@ GetNextVariablePtr (
 {
   UINTN                 Value;
 
-  Value =  (UINTN) GetVariableDataPtr (Variable, VariableHeader, StoreInfo->AuthFlag);
-  Value += DataSizeOfVariable (VariableHeader, StoreInfo->AuthFlag);
+  Value =  (UINTN) PlatformGetVariableDataPtr (Variable, VariableHeader, StoreInfo->AuthFlag);
+  Value += PlatformDataSizeOfVariable (VariableHeader, StoreInfo->AuthFlag);
   Value += GET_PAD_SIZE (DataSizeOfVariable (VariableHeader, StoreInfo->AuthFlag));
   //
   // Be careful about pad size for alignment
@@ -447,7 +447,7 @@ GetNextVariablePtr (
 
 **/
 VARIABLE_STORE_STATUS
-GetVariableStoreStatus (
+PlatformGetVariableStoreStatus (
   IN VARIABLE_STORE_HEADER *VarStoreHeader
   )
 {
@@ -489,7 +489,7 @@ GetVariableStoreStatus (
 
 **/
 BOOLEAN
-CompareVariableName (
+PlatformCompareVariableName (
   IN VARIABLE_STORE_INFO    *StoreInfo,
   IN CONST CHAR16           *Name1,
   IN CONST CHAR16           *Name2,
@@ -522,7 +522,7 @@ CompareVariableName (
 
 **/
 EFI_STATUS
-CompareWithValidVariable (
+PlatformCompareWithValidVariable (
   IN  VARIABLE_STORE_INFO           *StoreInfo,
   IN  VARIABLE_HEADER               *Variable,
   IN  VARIABLE_HEADER               *VariableHeader,
@@ -534,7 +534,7 @@ CompareWithValidVariable (
   VOID      *Point;
   EFI_GUID  *TempVendorGuid;
 
-  TempVendorGuid = GetVendorGuidPtr (VariableHeader, StoreInfo->AuthFlag);
+  TempVendorGuid = PlatformGetVendorGuidPtr (VariableHeader, StoreInfo->AuthFlag);
 
   if (VariableName[0] == 0) {
     PtrTrack->CurrPtr = Variable;
@@ -550,9 +550,9 @@ CompareWithValidVariable (
         (((INT32 *) VendorGuid)[2] == ((INT32 *) TempVendorGuid)[2]) &&
         (((INT32 *) VendorGuid)[3] == ((INT32 *) TempVendorGuid)[3])
         ) {
-      ASSERT (NameSizeOfVariable (VariableHeader, StoreInfo->AuthFlag) != 0);
-      Point = (VOID *) GetVariableNamePtr (Variable, StoreInfo->AuthFlag);
-      if (CompareVariableName (StoreInfo, VariableName, Point, NameSizeOfVariable (VariableHeader, StoreInfo->AuthFlag))) {
+      ASSERT (PlatformNameSizeOfVariable (VariableHeader, StoreInfo->AuthFlag) != 0);
+      Point = (VOID *) PlatformGetVariableNamePtr (Variable, StoreInfo->AuthFlag);
+      if (PlatformCompareVariableName (StoreInfo, VariableName, Point, PlatformNameSizeOfVariable (VariableHeader, StoreInfo->AuthFlag))) {
         PtrTrack->CurrPtr = Variable;
         return EFI_SUCCESS;
       }
@@ -623,7 +623,7 @@ GetHobVariableStore (
 
 **/
 BOOLEAN
-GetVariableHeader (
+PlatformGetVariableHeader (
   IN VARIABLE_STORE_INFO    *StoreInfo,
   IN VARIABLE_HEADER        *Variable,
   OUT VARIABLE_HEADER       **VariableHeader
@@ -639,14 +639,14 @@ GetVariableHeader (
   //
   *VariableHeader = Variable;
 
-  if (Variable >= GetEndPointer (StoreInfo->VariableStoreHeader)) {
+  if (Variable >= PlatformGetEndPointer (StoreInfo->VariableStoreHeader)) {
     //
     // Reach the end of variable store.
     //
     return FALSE;
   }
 
-  return IsValidVariableHeader (*VariableHeader);
+  return PlatformIsValidVariableHeader (*VariableHeader);
 }
 
 
@@ -707,16 +707,15 @@ FindVariableInHobsInternal (
     return EFI_INVALID_PARAMETER;
   }
 
-  if (GetVariableStoreStatus (VariableStoreHeader) != EfiValid) {
+  if (PlatformGetVariableStoreStatus (VariableStoreHeader) != EfiValid) {
     return EFI_UNSUPPORTED;
   }
 
   if (~VariableStoreHeader->Size == 0) {
     return EFI_NOT_FOUND;
   }
-
-  PtrTrack->StartPtr = GetStartPointer (VariableStoreHeader);
-  PtrTrack->EndPtr   = GetEndPointer   (VariableStoreHeader);
+  PtrTrack->StartPtr = PlatformGetStartPointer (VariableStoreHeader);
+  PtrTrack->EndPtr   = PlatformGetEndPointer   (VariableStoreHeader);
 
   InDeletedVariable = NULL;
 
@@ -733,9 +732,9 @@ FindVariableInHobsInternal (
   //
   // Find the variable by walking through the variable store
   //
-  while (GetVariableHeader (StoreInfo, Variable, &VariableHeader)) {
+  while (PlatformGetVariableHeader (StoreInfo, Variable, &VariableHeader)) {
     if (VariableHeader->State == VAR_ADDED || VariableHeader->State == (VAR_IN_DELETED_TRANSITION & VAR_ADDED)) {
-      if (CompareWithValidVariable (StoreInfo, Variable, VariableHeader, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {
+      if (PlatformCompareWithValidVariable (StoreInfo, Variable, VariableHeader, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {
         if (VariableHeader->State == (VAR_IN_DELETED_TRANSITION & VAR_ADDED)) {
           InDeletedVariable = PtrTrack->CurrPtr;
         } else {
@@ -743,7 +742,7 @@ FindVariableInHobsInternal (
         }
       }
     }
-    Variable = GetNextVariablePtr (StoreInfo, Variable, VariableHeader);
+    Variable = PlatformGetNextVariablePtr (StoreInfo, Variable, VariableHeader);
   }
   PtrTrack->CurrPtr = InDeletedVariable;
 
@@ -861,12 +860,12 @@ GetHobVariable (
         return Status;
       }
 
-      GetVariableHeader (&HobStoreInfo, HobVariable.CurrPtr, &HobVariableHeader);
+      PlatformGetVariableHeader (&HobStoreInfo, HobVariable.CurrPtr, &HobVariableHeader);
 
       //
       // Get data size
       //
-      HobVariableDataSize = DataSizeOfVariable (HobVariableHeader, HobStoreInfo.AuthFlag);
+      HobVariableDataSize = PlatformDataSizeOfVariable (HobVariableHeader, HobStoreInfo.AuthFlag);
       if (*DataSize >= HobVariableDataSize) {
         DEBUG ((EFI_D_INFO, "Temp Debug: Data buffer passed for variable data is large enough\n"));
         if (Data == NULL) {
@@ -874,7 +873,7 @@ GetHobVariable (
           return EFI_INVALID_PARAMETER;
         }
 
-        GetVariableNameOrData (&HobStoreInfo, GetVariableDataPtr (HobVariable.CurrPtr, HobVariableHeader, HobStoreInfo.AuthFlag), HobVariableDataSize, Data);
+        GetVariableNameOrData (&HobStoreInfo, PlatformGetVariableDataPtr (HobVariable.CurrPtr, HobVariableHeader, HobStoreInfo.AuthFlag), HobVariableDataSize, Data);
 
         if (Attributes != NULL) {
           *Attributes = HobVariableHeader->Attributes;
@@ -1057,8 +1056,8 @@ PeiGetHobNextVariableName (
     //
     // If variable name is not NULL, get next variable
     //
-    GetVariableHeader (&StoreInfo, Variable.CurrPtr, &VariableHeader);
-    Variable.CurrPtr = GetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
+    PlatformGetVariableHeader (&StoreInfo, Variable.CurrPtr, &VariableHeader);
+    Variable.CurrPtr = PlatformGetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
   }
 
   VariableStoreHeader[VariableHobTypeDefault] = GetHobVariableStore (VariableHobTypeDefault, &StoreInfoForDefault);
@@ -1068,12 +1067,12 @@ PeiGetHobNextVariableName (
     //
     // Switch from HOB to Non-Volatile.
     //
-    while (!GetVariableHeader (&StoreInfo, Variable.CurrPtr, &VariableHeader)) {
+    while (!PlatformGetVariableHeader (&StoreInfo, Variable.CurrPtr, &VariableHeader)) {
       //
       // Find current storage index
       //
       for (Type = (VARIABLE_HOB_TYPE) 0; Type < VariableHobTypeMax; Type++) {
-        if ((VariableStoreHeader[Type] != NULL) && (Variable.StartPtr == GetStartPointer (VariableStoreHeader[Type]))) {
+        if ((VariableStoreHeader[Type] != NULL) && (Variable.StartPtr == PlatformGetStartPointer (VariableStoreHeader[Type]))) {
           break;
         }
       }
@@ -1094,8 +1093,8 @@ PeiGetHobNextVariableName (
       if (Type == VariableHobTypeMax) {
         return EFI_NOT_FOUND;
       }
-      Variable.StartPtr = GetStartPointer (VariableStoreHeader[Type]);
-      Variable.EndPtr   = GetEndPointer   (VariableStoreHeader[Type]);
+      Variable.StartPtr = PlatformGetStartPointer (VariableStoreHeader[Type]);
+      Variable.EndPtr   = PlatformGetEndPointer   (VariableStoreHeader[Type]);
       Variable.CurrPtr  = Variable.StartPtr;
       GetHobVariableStore (Type, &StoreInfo);
     }
@@ -1109,12 +1108,12 @@ PeiGetHobNextVariableName (
         //
         Status = FindVariableInHobsInternal (
                    &StoreInfo,
-                   GetVariableNamePtr (Variable.CurrPtr, StoreInfo.AuthFlag),
-                   GetVendorGuidPtr (VariableHeader, StoreInfo.AuthFlag),
+                   PlatformGetVariableNamePtr (Variable.CurrPtr, StoreInfo.AuthFlag),
+                   PlatformGetVendorGuidPtr (VariableHeader, StoreInfo.AuthFlag),
                    &VariablePtrTrack
                    );
         if (!EFI_ERROR (Status) && VariablePtrTrack.CurrPtr != Variable.CurrPtr) {
-          Variable.CurrPtr = GetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
+          Variable.CurrPtr = PlatformGetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
           continue;
         }
       }
@@ -1123,27 +1122,27 @@ PeiGetHobNextVariableName (
       // Don't return cache HOB variable when default HOB overrides it
       //
       if ((VariableStoreHeader[VariableHobTypeDefault] != NULL) && (VariableStoreHeader[VariableHobTypeCache] != NULL) &&
-          (Variable.StartPtr == GetStartPointer (VariableStoreHeader[VariableHobTypeCache]))
+          (Variable.StartPtr == PlatformGetStartPointer (VariableStoreHeader[VariableHobTypeCache]))
          ) {
         Status = FindVariableInHobsInternal (
                    &StoreInfoForDefault,
-                   GetVariableNamePtr (Variable.CurrPtr, StoreInfo.AuthFlag),
-                   GetVendorGuidPtr (VariableHeader, StoreInfo.AuthFlag),
+                   PlatformGetVariableNamePtr (Variable.CurrPtr, StoreInfo.AuthFlag),
+                   PlatformGetVendorGuidPtr (VariableHeader, StoreInfo.AuthFlag),
                    &VariableInDefaultHob
                    );
         if (!EFI_ERROR (Status)) {
-          Variable.CurrPtr = GetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
+          Variable.CurrPtr = PlatformGetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
           continue;
         }
       }
 
-      VarNameSize = NameSizeOfVariable (VariableHeader, StoreInfo.AuthFlag);
+      VarNameSize = PlatformNameSizeOfVariable (VariableHeader, StoreInfo.AuthFlag);
       ASSERT (VarNameSize != 0);
 
       if (VarNameSize <= *VariableNameSize) {
-        GetVariableNameOrData (&StoreInfo, (UINT8 *) GetVariableNamePtr (Variable.CurrPtr, StoreInfo.AuthFlag), VarNameSize, (UINT8 *) VariableName);
+        GetVariableNameOrData (&StoreInfo, (UINT8 *) PlatformGetVariableNamePtr (Variable.CurrPtr, StoreInfo.AuthFlag), VarNameSize, (UINT8 *) VariableName);
 
-        CopyMem (VariableGuid, GetVendorGuidPtr (VariableHeader, StoreInfo.AuthFlag), sizeof (EFI_GUID));
+        CopyMem (VariableGuid, PlatformGetVendorGuidPtr (VariableHeader, StoreInfo.AuthFlag), sizeof (EFI_GUID));
 
         Status = EFI_SUCCESS;
       } else {
@@ -1156,7 +1155,7 @@ PeiGetHobNextVariableName (
       //
       return Status;
     } else {
-      Variable.CurrPtr = GetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
+      Variable.CurrPtr = PlatformGetNextVariablePtr (&StoreInfo, Variable.CurrPtr, VariableHeader);
     }
   }
 }
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.c
index 409376ad14..89c3e0220d 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Library/I2CLibPei/I2CDelayPei.c
@@ -1,7 +1,7 @@
 /** @file
   Timer instance for I2C Pei Library.
 
-  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 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
@@ -20,30 +20,4 @@
 #include <Library/PeiServicesTablePointerLib.h>
 #include <Ppi/Stall.h>
 
-/**
-  Stalls the CPU for at least the given number of microseconds.
 
-  @param[in]  MicroSeconds     The minimum number of microseconds to delay.
-
-  @retval  EFI_SUCCESS         Time delay successfully
-**/
-EFI_STATUS
-EFIAPI
-MicroSecondDelay (
-  IN UINTN                     MicroSeconds
-  )
-{
-  EFI_PEI_STALL_PPI              *StallPpi;
-  EFI_STATUS                     Status;
-  CONST EFI_PEI_SERVICES         **PeiServices;
-
-  PeiServices = GetPeiServicesTablePointer ();
-
-  Status = (**PeiServices).LocatePpi (PeiServices, &gEfiPeiStallPpiGuid, 0, NULL, (VOID **) &StallPpi);
-  ASSERT(!EFI_ERROR(Status));
-
-  StallPpi->Stall (PeiServices, StallPpi, MicroSeconds);
-
-  return EFI_SUCCESS;
-
-}
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c
index 89251fa19d..fbdc95ab38 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c
@@ -1,7 +1,7 @@
 /** @file
   Implements Platform Trust Technology (FTPM) PTP (Platform TPM Profile) Device Library.
 
-  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2012 - 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
@@ -54,65 +54,7 @@ PttHciPrintBuffer (
 }
 #endif // EFI_DEBUG
 
-UINT32 *
-EFIAPI
-MmioReadBuffer32 (
-  IN  UINTN       StartAddress,
-  IN  UINTN       Length,
-  OUT UINT32      *Buffer
-  )
-{
-  UINT32    *ReturnBuffer;
-
-  ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);
-
-  ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));
-  ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));
-
-  ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);
-  ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);
-
-  ReturnBuffer = Buffer;
-
-  while (Length != 0) {
-    *(Buffer++) = MmioRead32 (StartAddress);
-
-    StartAddress += sizeof (UINT32);
-    Length -= sizeof (UINT32);
-  }
-
-  return ReturnBuffer;
-}
 
-UINT32 *
-EFIAPI
-MmioWriteBuffer32 (
-  IN  UINTN        StartAddress,
-  IN  UINTN        Length,
-  IN  CONST UINT32 *Buffer
-  )
-{
-  UINT32    *ReturnBuffer;
-
-  ASSERT ((StartAddress & (sizeof (UINT32) - 1)) == 0);
-
-  ASSERT ((Length - 1) <=  (MAX_ADDRESS - StartAddress));
-  ASSERT ((Length - 1) <=  (MAX_ADDRESS - (UINTN) Buffer));
-
-  ASSERT ((Length & (sizeof (UINT32) - 1)) == 0);
-  ASSERT (((UINTN) Buffer & (sizeof (UINT32) - 1)) == 0);
-
-  ReturnBuffer = (UINT32 *) Buffer;
-
-  while (Length != 0) {
-    MmioWrite32 (StartAddress, *(Buffer++));
-
-    StartAddress += sizeof (UINT32);
-    Length -= sizeof (UINT32);
-  }
-
-  return ReturnBuffer;
-}
 
 EFI_STATUS
 EFIAPI
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/Private/PeiSeCUma/SeCUma.c b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/Private/PeiSeCUma/SeCUma.c
index 459ff4373f..acf8618aff 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/Private/PeiSeCUma/SeCUma.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/Private/PeiSeCUma/SeCUma.c
@@ -1,7 +1,7 @@
 /** @file
   Framework PEIM to SeCUma.
 
-  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 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
@@ -510,38 +510,7 @@ HideHeci23 (
 }
 
 
-/**
-  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;
-}
 
 
 /**
-- 
cgit v1.2.3