Multi board support.

Cleanup libraries for multi boards.

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

7 files changed, 72 insertions, 72 deletions

diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
index eef62d9faf..096d0e862c 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/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 (

+Minnow3MultiPlatformGpioTableInit (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   )

 {

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

+  DEBUG ((DEBUG_INFO, "Minnow3MultiPlatformGpioTableInit()...\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 = &mMinnow3_GpioInitData_SW[0];

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

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

+      PlatformInfoHob->PlatformGpioSetting_N = &mMinnow3_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 = &mMinnow3_GpioInitData_SW[0];

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

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

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

       break;

   }

 

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

 **/

 VOID

-SetGpioPadCfgLock (

+Minnow3SetGpioPadCfgLock (

   VOID

   )

 {

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

 **/

 EFI_STATUS

-MultiPlatformGpioProgram (

+Minnow3MultiPlatformGpioProgram (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   )

@@ -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 (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

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

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

+      GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_SW) / sizeof (mMinnow3_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 (mMinnow3_GpioInitData_LPSS_I2C) / sizeof (mMinnow3_GpioInitData_LPSS_I2C[0]), mMinnow3_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 (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

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

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

+    GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_SW) / sizeof (mMinnow3_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(mMinnow3_GpioInitData_FAB2)/sizeof(mMinnow3_GpioInitData_FAB2[0]), mMinnow3_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 (mMinnow3_GpioInitData_Audio_SSP6) / sizeof (mMinnow3_GpioInitData_Audio_SSP6[0]), mMinnow3_GpioInitData_Audio_SSP6);

     }

 

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

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

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

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

     }

 

     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 (mMinnow3_GpioInitData_EPI_Override) / sizeof (mMinnow3_GpioInitData_EPI_Override[0]), mMinnow3_GpioInitData_EPI_Override);

     }

     if (SystemConfiguration.GpioLock == TRUE) {

-      SetGpioPadCfgLock ();

+      Minnow3SetGpioPadCfgLock ();

     }

     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 (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

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

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

+      DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_SW) / sizeof (mMinnow3_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 (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);

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

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

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

 

     break;

   }

diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
index 193f347ec7..1bf848995a 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
@@ -13,8 +13,8 @@
 

 **/

 

-#ifndef _BOARDGPIOS_H_

-#define _BOARDGPIOS_H_

+#ifndef _MINNOW3_BOARDGPIOS_H_

+#define _MINNOW3_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  mMinnow3_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

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

 // North West Community

 //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_NW [] =

+BXT_GPIO_PAD_INIT  mMinnow3_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

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

 // West Community

 //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_W [] =

+BXT_GPIO_PAD_INIT  mMinnow3_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

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

  // South West Community

  //

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_SW[]=

+BXT_GPIO_PAD_INIT  mMinnow3_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

@@ -326,7 +326,7 @@ BXT_GPIO_PAD_INIT  mBXT_GpioInitData_SW[]=
   BXT_GPIO_PAD_CONF(L"SMB_ALERTB",                 M1,     NA    ,   NA   ,  NA     ,   NA       ,Wake_Disabled, P_20K_H,    NA   ,    NA  ,IOS_Masked, SAME, GPIO_PADBAR+ 0x00F8 , SOUTHWEST),//Feature: SMB_ALERTB

 };

 

-BXT_GPIO_PAD_INIT  mBXT_GpioInitData_Audio_SSP6 []=

+BXT_GPIO_PAD_INIT  mMinnow3_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

@@ -340,7 +340,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  mMinnow3_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

@@ -353,7 +353,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  mMinnow3_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

@@ -361,7 +361,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  mMinnow3_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),

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

 

 

-BXT_GPIO_PAD_INIT  LomDisableGpio[] =

+BXT_GPIO_PAD_INIT  Minnow3LomDisableGpio[] =

 {

   //

   // LAN

diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
index 114c3c9ac1..ac6bf58c13 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
@@ -81,7 +81,7 @@ MinnowBoard3PostMemInitCallback (
   //

   // Set init function PCD

   //

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

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

 

   //

   // Add init steps here

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

 **/

 

-#ifndef _BOARDINIT_H_

-#define _BOARDINIT_H_

+#ifndef _MINNOW3_BOARDINIT_H_

+#define _MINNOW3_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 Minnow3GpioTest (VOID);

 

 #endif

 

diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c
index 0d40777b6d..dc63725f6f 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c
@@ -25,11 +25,11 @@
 

 **/

 VOID

-GpioGroupTierInit (

+Minnow3GpioGroupTierInit (

   IN EFI_PLATFORM_INFO_HOB  *PlatformInfoHob

   )

 {

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

+  DEBUG ((DEBUG_INFO, "Minnow3GpioGroupTierInit 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, "Minnow3GpioGroupTierInit End\n"));

 }

 

 

 EFI_STATUS

 EFIAPI

-MultiPlatformInfoInit (

+Minnow3MultiPlatformInfoInit (

   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 = Minnow3MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);

   ASSERT_EFI_ERROR (Status);

 

   //

   // Program GPIO

   //

-  Status = MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);

+  Status = Minnow3MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);

 

   if (GetBxtSeries () == BxtP) {

-    GpioGroupTierInit (PlatformInfoHob);

+    Minnow3GpioGroupTierInit (PlatformInfoHob);

   }

 

   //

   // Update OemId

   //

-  Status = InitializeBoardOemId (PeiServices, PlatformInfoHob);

-  Status = InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);

+  Status = Minnow3InitializeBoardOemId (PeiServices, PlatformInfoHob);

+  Status = Minnow3InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);

 

   return EFI_SUCCESS;

 }

 

 

 EFI_STATUS

-InitializeBoardOemId (

+Minnow3InitializeBoardOemId (

   IN CONST EFI_PEI_SERVICES       **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   )

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

 

 EFI_STATUS

-InitializeBoardSsidSvid (

+Minnow3InitializeBoardSsidSvid (

   IN CONST EFI_PEI_SERVICES       **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   )

diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h
index 8ae5f7c3d2..2c8c7eb807 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/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 _MINNOW_MULTIPLATFORM_LIB_H_

+#define _MINNOW_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 (

+Minnow3GetPlatformInfoHob (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT EFI_PLATFORM_INFO_HOB     **PlatformInfoHob

   );

 

 EFI_STATUS

-MultiPlatformGpioTableInit (

+Minnow3MultiPlatformGpioTableInit (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   );

 

 EFI_STATUS

-MultiPlatformGpioProgram (

+Minnow3MultiPlatformGpioProgram (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN EFI_PLATFORM_INFO_HOB      *PlatformInfoHob

   );

 

 EFI_STATUS

-MultiPlatformInfoInit (

+Minnow3MultiPlatformInfoInit (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   IN OUT EFI_PLATFORM_INFO_HOB  *PlatformInfoHob

   );

 

 EFI_STATUS

-InitializeBoardOemId (

+Minnow3InitializeBoardOemId (

   IN CONST EFI_PEI_SERVICES      **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   );

 

 EFI_STATUS

-InitializeBoardSsidSvid (

+Minnow3InitializeBoardSsidSvid (

   IN CONST EFI_PEI_SERVICES       **PeiServices,

   IN EFI_PLATFORM_INFO_HOB        *PlatformInfoHob

   );

diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/PlatformInfoHob.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/PlatformInfoHob.c
index 8dac0ba280..871e2206d3 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/PlatformInfoHob.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/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 (

+Minnow3GetPlatformInfoHob (

   IN CONST EFI_PEI_SERVICES     **PeiServices,

   OUT EFI_PLATFORM_INFO_HOB     **PlatformInfoHob

   )