Multi board support.

Cleanup libraries for multi boards.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>

13 files changed, 98 insertions, 98 deletions

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h
index e8f2aa3f01..e7ba1d2556 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h
@@ -14,8 +14,8 @@
 

 **/

 

-#ifndef __BOARD_INIT_DXE_H__

-#define __BOARD_INIT_DXE_H__

+#ifndef __BENSON_BOARD_INIT_DXE_H__

+#define __BENSON_BOARD_INIT_DXE_H__

 

 #include <BoardFunctionsDxe.h>

 #include <Library/UefiDriverEntryPoint.h>

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c
index eef62d9faf..df11c8bbd9 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c
@@ -13,7 +13,7 @@
 

 **/

 

-#include <BoardGpios.h>

+#include "BoardGpios.h"

 #include <Library/GpioLib.h>

 #include <Library/SteppingLib.h>

 

@@ -30,12 +30,12 @@
 

 **/

 EFI_STATUS

-MultiPlatformGpioTableInit (

+BensonMultiPlatformGpioTableInit (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   )

 {

-  DEBUG ((DEBUG_INFO, "MultiPlatformGpioTableInit()...\n"));

+  DEBUG ((DEBUG_INFO, "BensonMultiPlatformGpioTableInit()...\n"));

   DEBUG ((DEBUG_INFO, "PlatformInfoHob->BoardId: 0x%02X\n", PlatformInfoHob->BoardId));

 

   //

@@ -45,16 +45,16 @@ MultiPlatformGpioTableInit (
     case BOARD_ID_LFH_CRB:

     case BOARD_ID_MINNOW:

     case BOARD_ID_BENSON:

-      PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];

-      PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];

-      PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];

-      PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];

+      PlatformInfoHob->PlatformGpioSetting_SW = &mBenson_GpioInitData_SW[0];

+      PlatformInfoHob->PlatformGpioSetting_W = &mBenson_GpioInitData_W[0];

+      PlatformInfoHob->PlatformGpioSetting_NW = &mBenson_GpioInitData_NW[0];

+      PlatformInfoHob->PlatformGpioSetting_N = &mBenson_GpioInitData_N[0];

       break;

     default:

-      PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];

-      PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];

-      PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];

-      PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];

+      PlatformInfoHob->PlatformGpioSetting_SW = &mBenson_GpioInitData_SW[0];

+      PlatformInfoHob->PlatformGpioSetting_W = &mBenson_GpioInitData_W[0];

+      PlatformInfoHob->PlatformGpioSetting_NW = &mBenson_GpioInitData_NW[0];

+      PlatformInfoHob->PlatformGpioSetting_N = &mBenson_GpioInitData_N[0];

       break;

   }

 

@@ -67,7 +67,7 @@ MultiPlatformGpioTableInit (
 

 **/

 VOID

-SetGpioPadCfgLock (

+BensonSetGpioPadCfgLock (

   VOID

   )

 {

@@ -146,7 +146,7 @@ SetGpioPadCfgLock (
 

 **/

 EFI_STATUS

-MultiPlatformGpioProgram (

+BensonMultiPlatformGpioProgram (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   )

@@ -175,7 +175,7 @@ MultiPlatformGpioProgram (
                       &SystemConfiguration

                       );

 

-  DEBUG ((DEBUG_INFO, "MultiPlatformGpioProgram()...\n"));

+  DEBUG ((DEBUG_INFO, "BensonMultiPlatformGpioProgram()...\n"));

 

   switch (PlatformInfoHob->BoardId) {

     case BOARD_ID_LFH_CRB:

@@ -185,24 +185,24 @@ MultiPlatformGpioProgram (
       // PAD programming

       //

       DEBUG ((DEBUG_INFO, "PAD programming, Board ID: 0x%X\n", PlatformInfoHob->BoardId));

-      GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

-      GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

-      GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

-      GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

+      GpioPadConfigTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

+      GpioPadConfigTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

+      GpioPadConfigTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

+      GpioPadConfigTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

 

       if (SystemConfiguration.ScIshEnabled == 0) {

         DEBUG ((DEBUG_INFO, "Switch ISH_I2C0 & ISH_I2C1 to LPSS_I2C5 and LPSS I2C6. \n" ));

-        GpioPadConfigTable (sizeof (mBXT_GpioInitData_LPSS_I2C) / sizeof (mBXT_GpioInitData_LPSS_I2C[0]), mBXT_GpioInitData_LPSS_I2C);

+        GpioPadConfigTable (sizeof (mBenson_GpioInitData_LPSS_I2C) / sizeof (mBenson_GpioInitData_LPSS_I2C[0]), mBenson_GpioInitData_LPSS_I2C);

       }

       break;

     default:

     //

     // PAD programming

     //

-    GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

-    GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

-    GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

-    GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

+    GpioPadConfigTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

+    GpioPadConfigTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

+    GpioPadConfigTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

+    GpioPadConfigTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

 

     //

     // Note1: This BXT BIOS WA needs to be applied after PAD programming to overwrite the GPIO setting to take effect.

@@ -211,7 +211,7 @@ MultiPlatformGpioProgram (
     //

     if (PlatformInfoHob->FABID == FAB2) {

       DEBUG ((DEBUG_INFO, "FAB ID: FAB2\n"));

-      GpioPadConfigTable(sizeof(mBXT_GpioInitData_FAB2)/sizeof(mBXT_GpioInitData_FAB2[0]), mBXT_GpioInitData_FAB2);

+      GpioPadConfigTable(sizeof(mBenson_GpioInitData_FAB2)/sizeof(mBenson_GpioInitData_FAB2[0]), mBenson_GpioInitData_FAB2);

     }

 

     if (SystemConfiguration.TDO == 2) {  //Auto

@@ -224,20 +224,20 @@ MultiPlatformGpioProgram (
 

     if (SystemConfiguration.ScHdAudioIoBufferOwnership == 3) {

       DEBUG ((DEBUG_INFO, "HD Audio IO Buffer Ownership is I2S. Change GPIO pin settings for it. \n" ));

-      GpioPadConfigTable (sizeof (mBXT_GpioInitData_Audio_SSP6) / sizeof (mBXT_GpioInitData_Audio_SSP6[0]), mBXT_GpioInitData_Audio_SSP6);

+      GpioPadConfigTable (sizeof (mBenson_GpioInitData_Audio_SSP6) / sizeof (mBenson_GpioInitData_Audio_SSP6[0]), mBenson_GpioInitData_Audio_SSP6);

     }

 

     if (SystemConfiguration.PcieRootPortEn[4] == FALSE) {

       DEBUG ((DEBUG_INFO, "Onboard LAN disable. \n" ));

-      GpioPadConfigTable (sizeof (LomDisableGpio) / sizeof (LomDisableGpio[0]), LomDisableGpio);

+      GpioPadConfigTable (sizeof (BensonLomDisableGpio) / sizeof (BensonLomDisableGpio[0]), BensonLomDisableGpio);

     }

 

     if (SystemConfiguration.EPIEnable == 1) {

       DEBUG ((DEBUG_INFO, "Overriding GPIO 191 for EPI\n"));

-      GpioPadConfigTable (sizeof (mBXT_GpioInitData_EPI_Override) / sizeof (mBXT_GpioInitData_EPI_Override[0]), mBXT_GpioInitData_EPI_Override);

+      GpioPadConfigTable (sizeof (mBenson_GpioInitData_EPI_Override) / sizeof (mBenson_GpioInitData_EPI_Override[0]), mBenson_GpioInitData_EPI_Override);

     }

     if (SystemConfiguration.GpioLock == TRUE) {

-      SetGpioPadCfgLock ();

+      BensonSetGpioPadCfgLock ();

     }

     DEBUG ((DEBUG_INFO, "No board ID available for this board ....\n"));

     break;

@@ -259,19 +259,19 @@ MultiPlatformGpioProgram (
       // PAD programming

       //

       DEBUG ((DEBUG_INFO, "Dump Community pad registers, Board ID: 0x%X\n", PlatformInfoHob->BoardId));

-      DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

-      DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

-      DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

-      DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

+      DumpGpioPadTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

+      DumpGpioPadTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

+      DumpGpioPadTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

+      DumpGpioPadTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

       break;

     default:

     //

     // Dump Community pad registers

     //

-    DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

-    DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

-    DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

-    DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

+    DumpGpioPadTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

+    DumpGpioPadTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);

+    DumpGpioPadTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);

+    DumpGpioPadTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);

 

     break;

   }

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h
index 92387e457a..e0bdde8739 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h
@@ -13,8 +13,8 @@
 

 **/

 

-#ifndef _BOARDGPIOS_H_

-#define _BOARDGPIOS_H_

+#ifndef _BENSON_BOARDGPIOS_H_

+#define _BENSON_BOARDGPIOS_H_

 

 #include <PiPei.h>

 #include"ChipsetAccess.h"

@@ -58,7 +58,7 @@ Wake_Enabled:
 //

 // North Community

 //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_N[] =

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_N[] =

 {

   //

   //                  Group Pin#:  pad_name,    PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,  Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm,     MMIO_Offset  ,Community

@@ -145,7 +145,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_N[] =
 //

 // North West Community

 //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_NW [] =

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_NW [] =

 {

   //

   //                 Group Pin#:  pad_name,     PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae,  IOSTerm,     MMIO_Offset    ,  Community

@@ -237,7 +237,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_NW [] =
 //

 // West Community

 //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_W [] =

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_W [] =

 {

   //

   //                   Group Pin#:  pad_name,    PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L, Inverted,GPI_ROUT,IOSstae, IOSTerm,     MMIO_Offset    , Community

@@ -290,7 +290,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_W [] =
  //

  // South West Community

  //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_SW[]=

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_SW[]=

 {

   //

   //                  Group Pin#:  pad_name,       PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae,  IOSTerm,   MMIO_Offset     ,  Community

@@ -331,7 +331,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_SW[]=
   BXT_GPIO_PAD_CONF(L"LPC_AD1",                    M0,     GPO   , GPIO_D ,  LO     ,   NA       ,Wake_Disabled, P_20K_H,    NA   ,    NA  ,IOS_Masked, SAME, GPIO_PADBAR+ 0x0130 , SOUTHWEST),

 };

 

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_Audio_SSP6 []=

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_Audio_SSP6 []=

 {

   //

   //                  Group Pin#:  pad_name,       PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm,MMIO_Offset, Community

@@ -345,7 +345,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_Audio_SSP6 []=
   BXT_GPIO_PAD_CONF(L"GPIO_192 DBI_SCL",         M0  ,     HI_Z  ,GPIO_D,   HI    ,   NA      ,  Wake_Disabled,  P_2K_H,   NA    ,    NA,NA        ,  NA  ,  GPIO_PADBAR+0x0028,  NORTHWEST),//Feature: Codec Power Down PD Net in Sch: SOC_CODEC_PD_N

 };

 

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_FAB2[] =

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_FAB2[] =

 {

   //

   //                  Group Pin#:  pad_name,    PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,  Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm,     MMIO_Offset  ,Community

@@ -358,7 +358,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_FAB2[] =
 //

 // GPIO 191 is only used if EPI reworks are applied on the board. This GPIO switches between SD Card data (if set to 1) and EPI data (if set to 0).

 //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_EPI_Override[] =

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_EPI_Override[] =

 {

   //

   //                  Group Pin#:  pad_name,    PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,  Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm,     MMIO_Offset  ,Community

@@ -366,7 +366,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_EPI_Override[] =
   BXT_GPIO_PAD_CONF(L"GPIO_191 DBI_SDA",        M0,   GPO,        GPIO_D,LO,       NA,           Wake_Disabled,P_20K_L, NA,       NA,       NA,      NA,          GPIO_PADBAR + 0x0020, NORTHWEST),//Feature: SD_I2C MUX SEL     Net in Sch: INA_MUX_SEL

 };

 

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_LPSS_I2C[] =

+BXT_GPIO_PAD_INIT  mBenson_GpioInitData_LPSS_I2C[] =

 {

   BXT_GPIO_PAD_CONF(L"GPIO_134 LPSS_I2C5_SDA",   M1   ,    NA   ,  NA    ,  NA    ,   NA      ,  Wake_Disabled, P_20K_H,   NA    ,    NA,  HizRx0I,  EnPd,    GPIO_PADBAR+0x0050,  WEST),

   BXT_GPIO_PAD_CONF(L"GPIO_135 LPSS_I2C5_SCL",   M1   ,    NA   ,  NA    ,  NA    ,   NA      ,  Wake_Disabled, P_20K_H,   NA    ,    NA,  HizRx0I,  EnPd,    GPIO_PADBAR+0x0058,  WEST),

@@ -375,7 +375,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_LPSS_I2C[] =
 };

 

 

-BXT_GPIO_PAD_INIT  LomDisableGpio[] =

+BXT_GPIO_PAD_INIT  BensonLomDisableGpio[] =

 {

   //

   // LAN

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c
index e33ce5aefc..7c44a631ad 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c
@@ -81,7 +81,7 @@ BensonGlacierPostMemInitCallback (
   //

   // Set init function PCD

   //

-  PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) MultiPlatformInfoInit);

+  PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) BensonMultiPlatformInfoInit);

 

   //

   // Add init steps here

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
index fa3919e3c0..0a549c2ddd 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
@@ -14,8 +14,8 @@
 

 **/

 

-#ifndef _BOARDINIT_H_

-#define _BOARDINIT_H_

+#ifndef _BENSON_BOARDINIT_H_

+#define _BENSON_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 BensonGpioTest (VOID);

 

 #endif

 

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c
index 0d40777b6d..e10ab846ca 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c
@@ -1,7 +1,7 @@
 /** @file

   This file does Multiplatform initialization.

 

-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2017, 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

@@ -25,11 +25,11 @@
 

 **/

 VOID

-GpioGroupTierInit (

+BensonGpioGroupTierInit (

   IN EFI_PLATFORM_INFO_HOB  *PlatformInfoHob

   )

 {

-  DEBUG ((DEBUG_INFO, "GpioGroupTierInit Start\n"));

+  DEBUG ((DEBUG_INFO, "BensonGpioGroupTierInit Start\n"));

   switch (PlatformInfoHob->BoardId) {

     default:

       GpioSetGroupToGpeDwX (GPIO_BXTP_GROUP_7,  // map group 7 to GPE 0 ~ 31

@@ -38,13 +38,13 @@ GpioGroupTierInit (
       break;

   }

 

-  DEBUG ((DEBUG_INFO, "GpioGroupTierInit End\n"));

+  DEBUG ((DEBUG_INFO, "BensonGpioGroupTierInit End\n"));

 }

 

 

 EFI_STATUS

 EFIAPI

-MultiPlatformInfoInit (

+BensonMultiPlatformInfoInit (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN OUT EFI_PLATFORM_INFO_HOB  *PlatformInfoHob

   )

@@ -110,30 +110,30 @@ MultiPlatformInfoInit (
   //

   // Get GPIO table

   //

-  Status = MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);

+  Status = BensonMultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);

   ASSERT_EFI_ERROR (Status);

 

   //

   // Program GPIO

   //

-  Status = MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);

+  Status = BensonMultiPlatformGpioProgram (PeiServices, PlatformInfoHob);

 

   if (GetBxtSeries () == BxtP) {

-    GpioGroupTierInit (PlatformInfoHob);

+    BensonGpioGroupTierInit (PlatformInfoHob);

   }

 

   //

   // Update OemId

   //

-  Status = InitializeBoardOemId (PeiServices, PlatformInfoHob);

-  Status = InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);

+  Status = BensonInitializeBoardOemId (PeiServices, PlatformInfoHob);

+  Status = BensonInitializeBoardSsidSvid (PeiServices, PlatformInfoHob);

 

   return EFI_SUCCESS;

 }

 

 

 EFI_STATUS

-InitializeBoardOemId (

+BensonInitializeBoardOemId (

   IN CONST EFI_PEI_SERVICES       **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   )

@@ -158,7 +158,7 @@ InitializeBoardOemId (
 }

 

 EFI_STATUS

-InitializeBoardSsidSvid (

+BensonInitializeBoardSsidSvid (

   IN CONST EFI_PEI_SERVICES       **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   )

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
index 8ae5f7c3d2..b9844efd4f 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
@@ -2,7 +2,7 @@
   Multiplatform initialization header file.

   This file includes package header files, library classes.

 

-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2017, 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

@@ -14,8 +14,8 @@
 

 **/

 

-#ifndef _MULTIPLATFORM_LIB_H_

-#define _MULTIPLATFORM_LIB_H_

+#ifndef _BENSON_MULTIPLATFORM_LIB_H_

+#define _BENSON_MULTIPLATFORM_LIB_H_

 

 #define LEN_64M       0x4000000

 //

@@ -88,37 +88,37 @@
 #define SUBSYSTEM_SVID_SSID   (SUBSYSTEM_VENDOR_ID + (SUBSYSTEM_DEVICE_ID << 16))

 

 EFI_STATUS

-GetPlatformInfoHob (

+BensonGetPlatformInfoHob (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT EFI_PLATFORM_INFO_HOB     **PlatformInfoHob

   );

 

 EFI_STATUS

-MultiPlatformGpioTableInit (

+BensonMultiPlatformGpioTableInit (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   );

 

 EFI_STATUS

-MultiPlatformGpioProgram (

+BensonMultiPlatformGpioProgram (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   );

 

 EFI_STATUS

-MultiPlatformInfoInit (

+BensonMultiPlatformInfoInit (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN OUT EFI_PLATFORM_INFO_HOB  *PlatformInfoHob

   );

 

 EFI_STATUS

-InitializeBoardOemId (

+BensonInitializeBoardOemId (

   IN CONST EFI_PEI_SERVICES      **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   );

 

 EFI_STATUS

-InitializeBoardSsidSvid (

+BensonInitializeBoardSsidSvid (

   IN CONST EFI_PEI_SERVICES       **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   );

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c
index 8dac0ba280..30700e0079 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c
@@ -1,7 +1,7 @@
 /** @file

   This file does Multiplatform initialization.

 

-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2017, 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

@@ -26,7 +26,7 @@
 

 **/

 EFI_STATUS

-GetPlatformInfoHob (

+BensonGetPlatformInfoHob (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT EFI_PLATFORM_INFO_HOB     **PlatformInfoHob

   )

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
index cac4eb6e08..122ed9a89a 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
@@ -31,14 +31,14 @@ BensonGlacierPreMemInit (
   IN PEI_BOARD_PRE_MEM_INIT_PPI *This

   );

 

-static PEI_BOARD_PRE_MEM_INIT_PPI mPreMemInitPpiInstance = {

+static PEI_BOARD_PRE_MEM_INIT_PPI mBensonPreMemInitPpiInstance = {

   BensonGlacierPreMemInit

 };

 

 static EFI_PEI_PPI_DESCRIPTOR mBensonGlacierPreMemInitPpi = {

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

   &gBoardPreMemInitPpiGuid,

-  &mPreMemInitPpiInstance

+  &mBensonPreMemInitPpiInstance

 };

 

 static EFI_PEI_PPI_DESCRIPTOR mBensonGlacierPreMemInitDonePpi = {

@@ -77,7 +77,7 @@ BensonGlacierPreMemInit (
   //

   // Pre Mem Board Init

   //

-  Status = GetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);

+  Status = BensonGetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);

 

   if (BoardId != (UINT8) BOARD_ID_BENSON) {

     DEBUG ((EFI_D_INFO,  "Not a Benson Glacier - skip\n"));

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
index fa3919e3c0..0a549c2ddd 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
@@ -14,8 +14,8 @@
 

 **/

 

-#ifndef _BOARDINIT_H_

-#define _BOARDINIT_H_

+#ifndef _BENSON_BOARDINIT_H_

+#define _BENSON_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 BensonGpioTest (VOID);

 

 #endif

 

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h
index 4223f115c8..ab61949885 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h
@@ -2,7 +2,7 @@
   Multiplatform initialization header file.

   This file includes package header files, library classes.

 

-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2017, 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

@@ -14,8 +14,8 @@
 

 **/

 

-#ifndef _MULTIPLATFORM_LIB_H_

-#define _MULTIPLATFORM_LIB_H_

+#ifndef _BENSON_MULTIPLATFORM_LIB_H_

+#define _BENSON_MULTIPLATFORM_LIB_H_

 

 #include <BoardFunctionsPei.h>

 #include <Guid/SetupVariable.h>

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
index bacdab1f22..e164cfda77 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
@@ -22,7 +22,7 @@
 

 EFI_STATUS

 EFIAPI

-GetEmbeddedBoardIdFabId(

+BensonGetEmbeddedBoardIdFabId(

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *BoardId,

   OUT UINT8                     *FabId

@@ -89,7 +89,7 @@ GetEmbeddedBoardIdFabId(
                      (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00C8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \

                      (((GpioPadRead (GetCommOffset (NORTH, 0x01E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3));

 

-  DEBUG ((DEBUG_INFO,  "BoardId from PMIC strap: %02X\n", *BoardId));

+  DEBUG ((DEBUG_INFO,  "BoardId: %02X\n", *BoardId));

 

   //

   // Fab_ID0: PMIC_I2C_SDA

@@ -147,7 +147,7 @@ GetEmbeddedBoardIdFabId(
                    (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00D8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \

                    (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3));

 

-  DEBUG ((EFI_D_INFO,  "FabId from PMIC strap: %02X\n", *FabId));

+  DEBUG ((EFI_D_INFO,  "FabId: %02X\n", *FabId));

 

 

   return EFI_SUCCESS;

@@ -156,7 +156,7 @@ GetEmbeddedBoardIdFabId(
 

 EFI_STATUS

 EFIAPI

-GetIVIBoardIdFabId (

+BensonGetIVIBoardIdFabId (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *BoardId,

   OUT UINT8                     *FabId

diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h
index 3999aaa726..7fc0cc3f92 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h
@@ -13,8 +13,8 @@
 

 **/

 

-#ifndef __PLATFORM_ID_H__

-#define __PLATFORM_ID_H__

+#ifndef __BENSON_PLATFORM_ID_H__

+#define __BENSON_PLATFORM_ID_H__

 

 //

 // Strap Fw Cfg ID define

@@ -27,14 +27,14 @@
 

 EFI_STATUS

 EFIAPI

-GetFwCfgId (

+BensonGetFwCfgId (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *FwCfgId

   );

 

 EFI_STATUS

 EFIAPI

-GetBoardIdFabId (

+BensonGetBoardIdFabId (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *BoardId,

   OUT UINT8                     *FabId

@@ -42,7 +42,7 @@ GetBoardIdFabId (
 

 EFI_STATUS

 EFIAPI

-GetEmbeddedBoardIdFabId (

+BensonGetEmbeddedBoardIdFabId (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *BoardId,

   OUT UINT8                     *FabId

@@ -50,7 +50,7 @@ GetEmbeddedBoardIdFabId (
 

 EFI_STATUS

 EFIAPI

-GetIVIBoardIdFabId (

+BensonGetIVIBoardIdFabId (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *BoardId,

   OUT UINT8                     *FabId

@@ -58,21 +58,21 @@ GetIVIBoardIdFabId (
 

 EFI_STATUS

 EFIAPI

-GetDockId (

+BensonGetDockId (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *DockId

   );

 

 EFI_STATUS

 EFIAPI

-GetOsSelPss (

+BensonGetOsSelPss (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *OsSelPss

   );

 

 EFI_STATUS

 EFIAPI

-GetBomIdPss (

+BensonGetBomIdPss (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT UINT8                     *BomIdPss

   );