5 files changed, 19 insertions, 19 deletions
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c
index 5dab22514a..aa22e5622e 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c
@@ -31,14 +31,14 @@ LeafHillPreMemInit (
   IN PEI_BOARD_PRE_MEM_INIT_PPI *This
   );
 
-static PEI_BOARD_PRE_MEM_INIT_PPI mPreMemInitPpiInstance = {
+static PEI_BOARD_PRE_MEM_INIT_PPI mLeafHillPreMemInitPpiInstance = {
   LeafHillPreMemInit
 };
 
 static EFI_PEI_PPI_DESCRIPTOR mLeafHillPreMemInitPpi = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
   &gBoardPreMemInitPpiGuid,
-  &mPreMemInitPpiInstance
+  &mLeafHillPreMemInitPpiInstance
 };
 
 static EFI_PEI_PPI_DESCRIPTOR mLeafHillPreMemInitDonePpi = {
@@ -76,7 +76,7 @@ LeafHillPreMemInit (
   //
   // Pre Mem Board Init
   //
-  Status = GetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
+  Status = LeafHillGetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
   if (BoardId != (UINT8) BOARD_ID_LFH_CRB) {
     DEBUG ((EFI_D_INFO,  "Not a Leaf Hill Board - skip\n"));
     return EFI_SUCCESS;
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h
index fa3919e3c0..298613ae63 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h
@@ -14,8 +14,8 @@
 
 **/
 
-#ifndef _BOARDINIT_H_
-#define _BOARDINIT_H_
+#ifndef _LEAFHILL_BOARDINIT_H_
+#define _LEAFHILL_BOARDINIT_H_
 
 #include <PiPei.h>
 #include <Library/IoLib.h>
@@ -23,7 +23,7 @@
 #include <Library/TimerLib.h>
 #include <Guid/PlatformInfo_Aplk.h>
 
-VOID GpioTest (VOID);
+VOID LeafHillGpioTest (VOID);
 
 #endif
 
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h
index 57296b2258..10132aa739 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h
@@ -14,8 +14,8 @@
 
 **/
 
-#ifndef _MULTIPLATFORM_LIB_H_
-#define _MULTIPLATFORM_LIB_H_
+#ifndef _LEAFHILL_MULTIPLATFORM_LIB_H_
+#define _LEAFHILL_MULTIPLATFORM_LIB_H_
 
 #include <BoardFunctionsPei.h>
 #include <Guid/SetupVariable.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
index 40554b95ee..d5fc5185bd 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
@@ -22,7 +22,7 @@
 
 EFI_STATUS
 EFIAPI
-GetEmbeddedBoardIdFabId(
+LeafHillGetEmbeddedBoardIdFabId(
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *BoardId,
   OUT UINT8                     *FabId
@@ -156,7 +156,7 @@ GetEmbeddedBoardIdFabId(
 
 EFI_STATUS
 EFIAPI
-GetIVIBoardIdFabId (
+LeafHillGetIVIBoardIdFabId (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *BoardId,
   OUT UINT8                     *FabId
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h
index 3999aaa726..d7491fdc8a 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h
@@ -13,8 +13,8 @@
 
 **/
 
-#ifndef __PLATFORM_ID_H__
-#define __PLATFORM_ID_H__
+#ifndef __LEAFHILL_PLATFORM_ID_H__
+#define __LEAFHILL_PLATFORM_ID_H__
 
 //
 // Strap Fw Cfg ID define
@@ -27,14 +27,14 @@
 
 EFI_STATUS
 EFIAPI
-GetFwCfgId (
+LeafHillGetFwCfgId (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *FwCfgId
   );
 
 EFI_STATUS
 EFIAPI
-GetBoardIdFabId (
+LeafHillGetBoardIdFabId (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *BoardId,
   OUT UINT8                     *FabId
@@ -42,7 +42,7 @@ GetBoardIdFabId (
 
 EFI_STATUS
 EFIAPI
-GetEmbeddedBoardIdFabId (
+LeafHillGetEmbeddedBoardIdFabId (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *BoardId,
   OUT UINT8                     *FabId
@@ -50,7 +50,7 @@ GetEmbeddedBoardIdFabId (
 
 EFI_STATUS
 EFIAPI
-GetIVIBoardIdFabId (
+LeafHillGetIVIBoardIdFabId (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *BoardId,
   OUT UINT8                     *FabId
@@ -58,21 +58,21 @@ GetIVIBoardIdFabId (
 
 EFI_STATUS
 EFIAPI
-GetDockId (
+LeafHillGetDockId (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *DockId
   );
 
 EFI_STATUS
 EFIAPI
-GetOsSelPss (
+LeafHillGetOsSelPss (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *OsSelPss
   );
 
 EFI_STATUS
 EFIAPI
-GetBomIdPss (
+LeafHillGetBomIdPss (
   IN CONST EFI_PEI_SERVICES     **PeiServices,
   OUT UINT8                     *BomIdPss
   );